diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 2821164bb10..ff2e7fde1bd 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -45,7 +45,7 @@ export class PanelCtrl {
     }
 
     $scope.$on("refresh", () => this.refresh());
-    $scope.$on("render", () => this.calculatePanelHeight());
+    $scope.$on("render", () => this.render());
   }
 
   init() {
@@ -149,6 +149,7 @@ export class PanelCtrl {
       return;
     }
 
+    this.calculatePanelHeight();
     this.events.emit('render', payload);
   }