diff --git a/public/app/features/dashboard/DashboardModel.ts b/public/app/features/dashboard/DashboardModel.ts
index ee057722869..e86fa9d462e 100644
--- a/public/app/features/dashboard/DashboardModel.ts
+++ b/public/app/features/dashboard/DashboardModel.ts
@@ -709,12 +709,12 @@ export class DashboardModel {
 
           delete panel.span;
 
-          xPos += rowGridHeight;
+          xPos += panel.gridPos.w;
 
           this.panels.push(new PanelModel(panel));
         }
 
-        yPos += height;
+        yPos += rowGridHeight;
       }
 
       console.log('panels', this.panels);