diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14860efa5ae..19a9d6d74be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
 # vNext
 - More graphite functions
 - Fix for Text panel, now changes take effect directly (Issue #251)
-- Fix when adding functions without params that did not cause graph to update (issue #267)
+- Fix when adding functions without params that did not cause graph to update (Issue #267)
+- Graphite errors are now much easier to see and troubleshoot with the new inspector (Issue #265)
+- Use influxdb aliases to distinguish between multiple columns (Issue #283)
 
 # 1.5.2 (2013-03-24)
 ### New Features and improvements
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index 1fb75db0248..251da8ff3af 100644
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -52,14 +52,25 @@ function (angular, $, kbn, moment, _) {
           }
         }
 
-        // Function for rendering panel
-        function render_panel() {
-          if (!data) { return; }
-          if (scope.otherPanelInFullscreenMode()) { return; }
-          if (!setElementHeight()) { return; }
+        function shouldAbortRender() {
+          if (!data) {
+            return true;
+          }
+          if ($rootScope.fullscreen && !scope.fullscreen) {
+            return true;
+          }
+
+          if (!setElementHeight()) { return true; }
 
           if (_.isString(data)) {
             render_panel_as_graphite_png(data);
+            return true;
+          }
+        }
+
+        // Function for rendering panel
+        function render_panel() {
+          if (shouldAbortRender()) {
             return;
           }