diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js
index b0ac97d3423..638b92fface 100644
--- a/src/app/directives/dashEditLink.js
+++ b/src/app/directives/dashEditLink.js
@@ -48,7 +48,7 @@ function (angular, $) {
             if (editorScope) { editorScope.dismiss(); }
           }
 
-          scope.onAppEvent("dashboard-loaded", hideEditorPane);
+          scope.$on("$destroy", hideEditorPane);
           scope.onAppEvent('hide-dash-editor', hideEditorPane);
 
           scope.onAppEvent('show-dash-editor', function(evt, payload) {
@@ -65,6 +65,7 @@ function (angular, $) {
             editorScope = payload.scope ? payload.scope.$new() : scope.$new();
 
             editorScope.dismiss = function() {
+              console.log('dismiss: ');
               editorScope.$destroy();
               elem.empty();
               lastEditor = null;
diff --git a/src/app/features/graphite/datasource.js b/src/app/features/graphite/datasource.js
index a486250ac74..1b6c5007017 100644
--- a/src/app/features/graphite/datasource.js
+++ b/src/app/features/graphite/datasource.js
@@ -158,7 +158,6 @@ function (angular, _, $, config, kbn, moment) {
           date = date.replace('M', 'mon');
           return date;
         }
-
         date = kbn.parseDate(date);
       }