diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js
index a5cc244a998..8db92c3111e 100644
--- a/src/app/controllers/graphiteTarget.js
+++ b/src/app/controllers/graphiteTarget.js
@@ -67,9 +67,15 @@ function (angular, _, config, graphiteFuncs, Parser) {
         if ((index-1) >= func.def.params.length) {
           throw { message: 'invalid number of parameters to method ' + func.def.name };
         }
+
         func.params[index - 1] = astNode.value;
         break;
+
       case 'metric':
+        if ($scope.segments.length > 0) {
+          throw { message: 'Multiple metric params not supported, use text editor.' };
+        }
+
         $scope.segments = _.map(astNode.segments, function(segment) {
           return {
             val: segment.value,
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html
index cd8a1f0a3ea..d0b3bd458ba 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graphite/module.html
@@ -97,7 +97,7 @@
     </span>
   </div>
 
-  <div class="panel-full-edit-tabs" ng-show="inEditMode">
+  <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>
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 72965cfec65..8ab3c26abe5 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -211,7 +211,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
 
 
     $scope.init = function() {
-      $scope.openConfigureModal({preventDefault: function() {}, stopPropagation: function() {} });
+      //$scope.openConfigureModal({preventDefault: function() {}, stopPropagation: function() {} });
 
       // Hide view options by default
       $scope.options = false;