diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js
index 2db993bbd59..627d2b989d5 100644
--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -67,10 +67,6 @@ function (angular, config, _) {
       });
     };
 
-    $scope.closeFullEdit = function() {
-      $rootScope.$emit('fullEditMode', false);
-    };
-
     $scope.isPanel = function(obj) {
       if(!_.isNull(obj) && !_.isUndefined(obj) && !_.isUndefined(obj.type)) {
         return true;
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html
index d56fe516d73..87710f28ee7 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graphite/module.html
@@ -110,5 +110,27 @@
         <span ng-if="panel.show_query">{{series.info.alias || series.info.query}}</span>
         <span ng-if="!panel.show_query">{{series.info.alias}}</span>
       </span>
-    </span>
+  </span>
+
+  <div class="fluid-row panel-full-edit-mode-controls" ng-show="inEditMode" style="margin-top: 20px;">
+      <div ng-model="editor.index" bs-tabs>
+        <div ng-repeat="tab in setEditorTabs(panelMeta)" data-title="{{tab}}">
+        </div>
+      </div>
+      <div ng-show="editorTabs[editor.index] == 'General'">
+        <div ng-include src="'app/partials/panelgeneral.html'"></div>
+      </div>
+
+      <div ng-show="editorTabs[editor.index] == 'Panel'">
+        <div ng-include src="edit_path(panel.type)"></div>
+      </div>
+
+      <div ng-repeat="tab in panelMeta.editorTabs" ng-show="editorTabs[editor.index] == tab.title">
+        <div ng-include src="tab.src"></div>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-danger" ng-click="closeEditMode()">Close</button>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 4fe946f860d..ad416a12fe1 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -225,6 +225,10 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv) {
       }
     };
 
+    $scope.closeEditMode = function() {
+      $rootScope.$emit('fullEditMode', false);
+    };
+
     $scope.interval_label = function(interval) {
       return $scope.panel.auto_int && interval === $scope.panel.interval ? interval+" (auto)" : interval;
     };
diff --git a/src/app/panels/graphite/styleEditor.html b/src/app/panels/graphite/styleEditor.html
index 874a22640b5..89da062d69c 100644
--- a/src/app/panels/graphite/styleEditor.html
+++ b/src/app/panels/graphite/styleEditor.html
@@ -2,13 +2,13 @@
   <div class="section">
     <h5>Chart Options</h5>
     <div class="editor-option">
-      <label class="small">Bars</label><input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars">
+      <label class="small">Bars</label><input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars" ng-change="render()">
     </div>
     <div class="editor-option">
-      <label class="small">Lines</label><input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines">
+      <label class="small">Lines</label><input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines" ng-change="render()">
     </div>
     <div class="editor-option">
-      <label class="small">Points</label><input type="checkbox" ng-model="panel.points" ng-checked="panel.points">
+      <label class="small">Points</label><input type="checkbox" ng-model="panel.points" ng-checked="panel.points" ng-change="render()">
     </div>
     <div class="editor-option">
       <label class="small">Selectable</label><input type="checkbox" ng-model="panel.interactive" ng-checked="panel.interactive">
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index b8cd431898f..5fcbe0e00d5 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -13,14 +13,6 @@
 <div class="container-fluid main">
   <div class="row-fluid">
     <div class="row-fluid container" style="margin-top:10px; width:98%">
-      <!-- Full edit mode -->
-      <div class="row-fluid kibana-row" ng-show="fullEditMode" style="text-align: center; z-index: 1500; position: absolute; background-color: #272b30">
-        <h5>
-          Configure Panel
-          <i ng-click="closeFullEdit()" class="pointer icon-remove" style="position: relative; top: 0px; left: 15px;"></i>
-        </h5>
-      </div>
-
       <div ng-show="fullEditMode" class="modal-backdrop fade in"></div>
       <!-- Rows -->
       <div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.current.rows" ng-style="row_style(row)">