diff --git a/public/app/core/directives/dash_edit_link.js b/public/app/core/directives/dash_edit_link.js
index 5f7bdb956de..3e4bdd4c5c7 100644
--- a/public/app/core/directives/dash_edit_link.js
+++ b/public/app/core/directives/dash_edit_link.js
@@ -113,12 +113,18 @@ function ($, angular, coreModule) {
         });
 
         scope.$on("$destroy", hideEditorPane);
+
         scope.onAppEvent('hide-dash-editor', function() {
           hideEditorPane(false);
         });
 
         scope.onAppEvent('show-dash-editor', showEditorPane);
+
+        scope.onAppEvent('panel-fullscreen-enter', function() {
+          scope.appEvent('hide-dash-editor');
+        });
       }
     };
   });
 });
+