diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts
index ff964f6ed4c..7092608085d 100644
--- a/public/app/features/plugins/plugin_component.ts
+++ b/public/app/features/plugins/plugin_component.ts
@@ -93,7 +93,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
 
       PanelCtrl.templatePromise = getTemplate(PanelCtrl).then(template => {
         PanelCtrl.templateUrl = null;
-        PanelCtrl.template = `<grafana-panel ctrl="ctrl" class="panel-editor-container">${template}</grafana-panel>`;
+        PanelCtrl.template = `<grafana-panel ctrl="ctrl" class="panel-height-helper">${template}</grafana-panel>`;
         return componentInfo;
       });
 
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 8d5e52fa60b..f2286991a9c 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -8,8 +8,7 @@
   height: 100%;
 
   &--edit {
-    flex: 1 1 0;
-    height: unset;
+    height: 40%;
     margin: 0 $dashboard-padding;
   }
 
@@ -25,7 +24,7 @@
   margin-top: $panel-margin*2;
   display: flex;
   flex-direction: row;
-  height: 60%;
+  flex: 1 1 0;
   position: relative;
 }
 
@@ -235,8 +234,8 @@
   .gicon {
     height: 44px;
     width: 53px;
-    transition: transform 0.1s ease;
     margin-right: 5px;
+    transition: transform 0.1s ease 0.1s;
 
     &:hover {
       filter: $panel-editor-side-menu-shadow;
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index dbbfe48c828..a005b0386a3 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -3,10 +3,6 @@
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-
-  &--has-submenu {
-    height: calc(100% - 50px);
-  }
 }
 
 .template-variable {