diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js
index 36b65c69a0f..7a564051d4c 100644
--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -66,11 +66,11 @@ function (angular, $, config, _) {
 
     $scope.bindKeyboardShortcuts = function() {
       $rootScope.$on('panel-fullscreen-enter', function() {
-        $scope.fullscreenPanelExists = true;
+        $rootScope.fullscreen = true;
       });
 
       $rootScope.$on('panel-fullscreen-exit', function() {
-        $scope.fullscreenPanelExists = false;
+        $rootScope.fullscreen = false;
       });
 
       keyboardManager.bind('ctrl+f', function(evt) {
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html
index 8b64639ca6d..92aa7e2bafc 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graphite/module.html
@@ -54,7 +54,7 @@
     <div ng-include="'app/panels/graphite/legend.html'"></div>
   </div>
 
-  <div class="panel-full-edit-tabs" ng-if="inEditMode">
+  <div class="panel-full-edit-tabs" ng-if="editMode">
       <div ng-model="editor.index" bs-tabs>
         <div ng-repeat="tab in editorTabs" data-title="{{tab}}">
         </div>
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 11514cdbb5b..bd565042c02 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -214,6 +214,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
     $scope.init = function() {
 
       // Hide view options by default
+      $scope.fullscreen = false;
       $scope.options = false;
       $scope.editor = {index: 1};
       $scope.editorTabs = _.union(['General'],_.pluck($scope.panelMeta.fullEditorTabs,'title'));
@@ -381,23 +382,26 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
     $scope.enterFullscreenMode = function(options) {
       var oldHeight = $scope.row.height;
       var docHeight = $(window).height();
+
       $scope.row.height = options.edit ? 200 : Math.floor(docHeight * 0.7);
+      $scope.editMode = options.edit;
 
-      var closeEditMode = $rootScope.$on('panel-fullscreen-exit', function() {
-        $scope.inEditMode = false;
-        $scope.fullscreen = false;
-        $scope.row.height = oldHeight;
+      if (!$scope.fullscreen) {
+        var closeEditMode = $rootScope.$on('panel-fullscreen-exit', function() {
+          $scope.editMode = false;
+          $scope.fullscreen = false;
+          $scope.row.height = oldHeight;
 
-        closeEditMode();
+          closeEditMode();
 
-        $timeout(function() {
-          $scope.$emit('render');
+          $timeout(function() {
+            $scope.dashboard.refresh();
+          });
         });
-      });
+      }
 
       $(window).scrollTop(0);
 
-      $scope.inEditMode = options.edit;
       $scope.fullscreen = true;
       $rootScope.$emit('panel-fullscreen-enter');
 
@@ -407,7 +411,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
     };
 
     $scope.openConfigureModal = function() {
-      if ($scope.fullscreen) {
+      if ($scope.editMode) {
         $rootScope.$emit('panel-fullscreen-exit');
         return;
       }
@@ -415,18 +419,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       $scope.enterFullscreenMode({edit: true});
     };
 
-    $scope.set_refresh = function (state) {
-      $scope.refresh = state;
-    };
-
-    $scope.close_edit = function() {
-      if($scope.refresh) {
-        $scope.get_data();
-      }
-      $scope.refresh =  false;
-      $scope.$emit('render');
-    };
-
     $scope.render = function() {
       $scope.$emit('render');
     };
@@ -458,20 +450,12 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       }
     };
 
-    $scope.toggleFullscreen = function(evt) {
-      if ($scope.fullscreen) {
+    $scope.toggleFullscreen = function() {
+      if ($scope.fullscreen && !$scope.editMode) {
         $rootScope.$emit('panel-fullscreen-exit');
         return;
       }
 
-      if (evt) {
-        var elem = $(evt.target);
-        if (!elem.hasClass('panel-extra') ||
-          elem.attr('ng-click')) {
-          return;
-        }
-      }
-
       $scope.enterFullscreenMode({edit: false});
     };
 
@@ -488,7 +472,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
   });
 
-  module.directive('histogramChart', function(filterSrv) {
+  module.directive('histogramChart', function(filterSrv, $rootScope) {
     return {
       restrict: 'A',
       template: '<div> </div>',
@@ -497,6 +481,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         var hiddenData = {};
 
         scope.$on('refresh',function() {
+          if ($rootScope.fullscreen && !scope.fullscreen) {
+            return;
+          }
+
           scope.get_data();
         });
 
diff --git a/src/index.html b/src/index.html
index d7698f640b5..fe6138746de 100644
--- a/src/index.html
+++ b/src/index.html
@@ -41,7 +41,7 @@
       </div>
     </div>
 
-    <div ng-view ng-class="{'dashboard-fullscreen': fullscreenPanelExists}"></div>
+    <div ng-view ng-class="{'dashboard-fullscreen': fullscreen}"></div>
 
   </body>
 </html>