diff --git a/public/app/core/routes/dashboard_loaders.js b/public/app/core/routes/dashboard_loaders.js
index 8a5ce7ad7ed..af49b684b59 100644
--- a/public/app/core/routes/dashboard_loaders.js
+++ b/public/app/core/routes/dashboard_loaders.js
@@ -28,15 +28,15 @@ function (coreModule) {
 
   coreModule.default.controller('NewDashboardCtrl', function($scope) {
     $scope.initDashboard({
-      meta: { canStar: false, canShare: false },
+      meta: { canStar: false, canShare: false, isNew: true },
       dashboard: {
         title: "New dashboard",
+        isNew: true,
         rows: [
           {
             title: 'Dashboard Row',
             height: '250px',
             panels:[],
-            isNew: true,
           }
         ]
       },
diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
index f40a8aa5801..4e6bcb9aaa9 100644
--- a/public/app/features/dashboard/model.ts
+++ b/public/app/features/dashboard/model.ts
@@ -65,15 +65,14 @@ export class DashboardModel {
     this.links = data.links || [];
     this.gnetId = data.gnetId || null;
 
-    if (this.id === null) {
-      this.editMode = true;
-    }
-
     this.updateSchema(data);
     this.initMeta(meta);
+
+    this.editMode = this.meta.isNew;
   }
 
   private initMeta(meta) {
+    console.log(meta);
     meta = meta || {};
 
     meta.canShare = meta.canShare !== false;
diff --git a/public/app/features/dashboard/row/row.ts b/public/app/features/dashboard/row/row.ts
index c996ff2d02e..a022467c811 100644
--- a/public/app/features/dashboard/row/row.ts
+++ b/public/app/features/dashboard/row/row.ts
@@ -19,7 +19,7 @@ export class DashRowCtrl {
   constructor(private $scope, private $rootScope, private $timeout, private uiSegmentSrv, private $q) {
     this.row.title = this.row.title || 'Row title';
 
-    if (this.row.isNew) {
+    if (this.dashboard.meta.isNew) {
       this.dropView = 1;
       delete this.row.isNew;
     }
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 7420d2a407a..ea704df7955 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -353,9 +353,9 @@ div.flot-text {
 .dash-row-add-panel {
   margin: 0;
   padding: $panel-margin*2;
-  display: flex;
-  align-items: flex-start;
-  position: relative;
+  // display: flex;
+  // align-items: flex-start;
+  // position: relative;
 }
 
 .add-panel-panels-scroll {