diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index d3662a0b8e9..2385354fa91 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -47,6 +47,7 @@ export class PanelCtrl {
 
   init() {
     this.publishAppEvent('panel-instantiated', {scope: this.$scope});
+    this.calculatePanelHeight();
     this.refresh();
   }