diff --git a/public/app/plugins/panel/dashlist/module.ts b/public/app/plugins/panel/dashlist/module.ts
index 6b956f80278..f9ccd1c7b32 100644
--- a/public/app/plugins/panel/dashlist/module.ts
+++ b/public/app/plugins/panel/dashlist/module.ts
@@ -32,6 +32,7 @@ class DashListCtrl extends PanelCtrl {
     }
 
     this.events.on('refresh', this.onRefresh.bind(this));
+    this.events.on('panel-size-changed', this.onPanelSizeChanged.bind(this));
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
 
     this.groups = [
@@ -58,6 +59,8 @@ class DashListCtrl extends PanelCtrl {
       }
       delete this.panel.mode;
     }
+
+    console.log(this);
   }
 
   onInitEditMode() {
@@ -66,6 +69,24 @@ class DashListCtrl extends PanelCtrl {
     this.addEditorTab('Options', 'public/app/plugins/panel/dashlist/editor.html');
   }
 
+  onPanelSizeChanged() {
+    this.setPanelHeight();
+  }
+
+  setPanelHeight() {
+    this.$scope.setPanelHeight();
+  }
+
+  link(scope, elem, attrs, ctrl: DashListCtrl) {
+    let panelContentElem = elem.find('.panel-content');
+    console.log(elem, panelContentElem);
+    panelContentElem.height(ctrl.height);
+
+    scope.setPanelHeight = () => {
+      panelContentElem.height(ctrl.height);
+    };
+  }
+
   onRefresh() {
     var promises = [];
 
@@ -74,7 +95,10 @@ class DashListCtrl extends PanelCtrl {
     promises.push(this.getSearch());
 
     return Promise.all(promises)
-      .then(this.renderingCompleted.bind(this));
+    .then(() => {
+      this.setPanelHeight();
+      return this.renderingCompleted();
+    });
   }
 
   getSearch() {