diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html
index 9e7156a6041..dfdbc643609 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graphite/module.html
@@ -62,7 +62,7 @@
 
   <div class="panel-full-edit-tabs" ng-if="inEditMode">
       <div ng-model="editor.index" bs-tabs>
-        <div ng-repeat="tab in setEditorTabs(panelMeta)" data-title="{{tab}}">
+        <div ng-repeat="tab in editorTabs" data-title="{{tab}}">
         </div>
       </div>
       <div ng-show="editorTabs[editor.index] == 'General'">
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index d2cb5236ccb..1756e14578b 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -215,6 +215,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       // Hide view options by default
       $scope.options = false;
       $scope.editor = {index: 1};
+      $scope.editorTabs = _.union(['General'],_.pluck($scope.panelMeta.fullEditorTabs,'title'));
       $scope.hiddenSeries = {};
 
       // Always show the query if an alias isn't set. Users can set an alias if the query is too
@@ -441,10 +442,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       $scope.$emit('toggleLegend', info.alias);
     };
 
-    $scope.setEditorTabs = function(panelMeta) {
-      $scope.editorTabs = _.union(['General'],_.pluck(panelMeta.fullEditorTabs,'title'));
-    };
-
   });
 
   module.directive('histogramChart', function(filterSrv) {