diff --git a/public/app/features/dashboard/dashgrid/dashgrid.ts b/public/app/features/dashboard/dashgrid/dashgrid.ts
index ccadf1c0592..0da2ce5ced5 100644
--- a/public/app/features/dashboard/dashgrid/dashgrid.ts
+++ b/public/app/features/dashboard/dashgrid/dashgrid.ts
@@ -20,6 +20,8 @@ const template = `
 </div>
 `;
 
+var rowIndex = 0;
+
 export class GridCtrl {
   options: any;
   row: any;
@@ -27,9 +29,14 @@ export class GridCtrl {
   panels: any;
   gridstack: any;
   gridElem: any;
+  isInitialized: boolean;
+  isDestroyed: boolean;
+  index: number;
 
   /** @ngInject */
-  constructor(private $rootScope, private $element, private $timeout) {
+  constructor(private $scope, private $element, private $timeout) {
+    this.index = rowIndex;
+    rowIndex += 1;
   }
 
   init() {
@@ -43,6 +50,8 @@ export class GridCtrl {
       handle: '.panel-header'
     }).data('gridstack');
 
+    this.isInitialized = true;
+
     this.gridElem.on('added', (e, items) => {
       for (let item of items) {
         this.onGridStackItemAdded(item);
@@ -61,52 +70,79 @@ export class GridCtrl {
   }
 
   onGridStackItemAdded(item) {
-    console.log('item added', item);
-    if (this.dashboard.tempPanel) {
-      //this.gridstack.removeWidget(item.el, false);
-
-      this.$timeout(() => {
-        this.row.panels.push(this.dashboard.tempPanel);
-      });
+    console.log('row: ' + this.index + ' item added', item);
+    // if item has id dont need to do anything
+    if (item.id) {
+      return;
     }
+
+    // if this comes from another row we need to remove it
+    this.$timeout(() => this.gridstack.removeWidget(item.el, true));
   }
 
   onGridStackItemRemoved(item) {
-    console.log('item removed', item.id);
-    let panel = this.dashboard.getPanelById(parseInt(item.id));
-    this.dashboard.tempPanel = panel;
-    this.$timeout(() => {
-      this.row.removePanel(panel, false);
-    });
+    console.log('row: ' + this.index + ' item removed', item.id, item);
+    // ignore items that have no panel id
+    // if (!item.id) {
+    //   return;
+    // }
+    //
+    // let panel = this.dashboard.getPanelById(parseInt(item.id));
+    //
+    // if (panel) {
+    //   panelChangingRow = panel
+    //   this.row.removePanel(panel, false);
+    // }
   }
 
   onGridStackItemsChanged(items) {
+    console.log('row: ' +this.index + ' changes', items);
+
     for (let item of items) {
-      var panel = this.dashboard.getPanelById(parseInt(item.id));
+      let isFromOtherRow = false;
+
+      if (!item.id) {
+        item.id  = parseInt(item.el.attr('data-gs-id'));
+        isFromOtherRow = true;
+      }
+
+      // find panel
+      var panelInfo = this.dashboard.getPanelInfoById(parseInt(item.id));
+
+      if (!panelInfo) {
+        console.log('row: ' + this.index + ' item change but no panel found for item', item);
+        continue;
+      }
+
+      // update panel model position
+      let panel = panelInfo.panel;
       panel.x = item.x;
       panel.y = item.y;
       panel.width = item.width;
       panel.height = item.height;
-    }
-    this.$rootScope.$broadcast('render');
-  }
 
-  bindItem(element) {
-    if (this.gridstack) {
-      this.gridstack.makeWidget(element);
+      // wait a bit before adding
+      if (isFromOtherRow) {
+        let movePanelFn = (panel, row) => {
+          return this.$timeout(() => {
+            console.log('moving panel movel to another row', panel);
+            // remove from source row
+            row.removePanel(panel, false);
+            // add this this row
+            this.row.panels.push(panel);
+          });
+        };
+        movePanelFn(panelInfo.panel, panelInfo.row);
+      }
     }
-  }
 
-  itemScopeDestroyed(element) {
-    console.log('itemScopeDestroyed');
-    if (this.gridstack) {
-      this.gridstack.removeWidget(element, false);
-    }
+    this.$scope.$broadcast('render');
   }
 
   destroy() {
     this.gridstack.destroy();
     this.gridstack = null;
+    this.isDestroyed = true;
   }
 }
 
@@ -169,9 +205,22 @@ export function dashGridItem($timeout, $rootScope) {
       }, scope);
 
       scope.$on('$destroy', () => {
-        gridCtrl.itemScopeDestroyed(element);
+        console.log('grid-item scope $destroy');
+        if (gridCtrl.isDestroyed) {
+          return;
+        }
+
+        let node = element.data('_gridstack_node');
+        if (node) {
+          console.log('grid-item scope $destroy removeWidget');
+          node._grid.removeWidget(element);
+        }
       });
 
+      if (gridCtrl.isInitialized) {
+        gridCtrl.gridstack.makeWidget(element);
+      }
+
       //   scope.onItemRemoved({item: item});
       //   ctrl.removeItem(element);
 
diff --git a/public/app/features/dashboard/row/row.html b/public/app/features/dashboard/row/row.html
index 4d2fbd9e4cd..1e82aefc3c0 100644
--- a/public/app/features/dashboard/row/row.html
+++ b/public/app/features/dashboard/row/row.html
@@ -8,5 +8,5 @@
 	</a>
 </div>
 
-<dash-grid row="ctrl.row" dashboard="ctrl.dashboard"></dash-grid>
+<dash-grid ng-if="!ctrl.row.collapse" row="ctrl.row" dashboard="ctrl.dashboard"></dash-grid>
 
diff --git a/public/sass/components/_gridstack.scss b/public/sass/components/_gridstack.scss
index 019f077f0b1..a3d31e631c2 100644
--- a/public/sass/components/_gridstack.scss
+++ b/public/sass/components/_gridstack.scss
@@ -4,6 +4,7 @@
 
 .grid-stack {
   position: relative;
+  min-height: 150px;
 }
 
 .grid-stack.grid-stack-rtl {