diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html
index d57be87fcbe..87bbc27b9b9 100644
--- a/src/app/panels/graphite/editor.html
+++ b/src/app/panels/graphite/editor.html
@@ -116,6 +116,5 @@
 </div>
 
 <div class="editor-row" style="margin-top: 20px" ng-show="editor.index == 1">
-  <button class="btn pull-right" ng-click="toggleFullscreen()">Close</button>
   <button class="btn btn-success pull-right" ng-click="add_target(panel.target)">Add target</button>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index cc96b750bde..c8736fdbcc4 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -371,9 +371,11 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
     $scope.enterFullscreenMode = function(options) {
       var docHeight = $(window).height();
+      var editHeight = Math.floor(docHeight * 0.3);
+      var fullscreenHeight = Math.floor(docHeight * 0.7);
       var oldTimeRange = $scope.range;
 
-      $scope.height = options.edit ? 200 : Math.floor(docHeight * 0.7);
+      $scope.height = options.edit ? editHeight : fullscreenHeight;
       $scope.editMode = options.edit;
 
       if (!$scope.fullscreen) {