diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 0a8d070a247..aed1b4b802b 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -66,6 +66,8 @@ module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
         ctrl.width = scope.$parent.$parent.size.width;
       }
 
+      updateDimensionsFromParentScope();
+
       // Pass PanelModel events down to angular controller event emitter
       subs.add(
         panel.events.subscribe(RefreshEvent, () => {
diff --git a/public/app/plugins/panel/heatmap/display_editor.ts b/public/app/plugins/panel/heatmap/display_editor.ts
index 3dcfddfaeae..6ed7f7e8af5 100644
--- a/public/app/plugins/panel/heatmap/display_editor.ts
+++ b/public/app/plugins/panel/heatmap/display_editor.ts
@@ -7,8 +7,6 @@ export class HeatmapDisplayEditorCtrl {
     $scope.editor = this;
     this.panelCtrl = $scope.ctrl;
     this.panel = this.panelCtrl.panel;
-
-    this.panelCtrl.render();
   }
 }