diff --git a/public/app/features/dashboard/dashgrid/dashgrid.ts b/public/app/features/dashboard/dashgrid/dashgrid.ts
index 62ccb4feb0d..e87d777fb3b 100644
--- a/public/app/features/dashboard/dashgrid/dashgrid.ts
+++ b/public/app/features/dashboard/dashgrid/dashgrid.ts
@@ -174,6 +174,7 @@ export function dashGridItem($timeout, $rootScope) {
         if (panel.id !== payload.panelId) {
           return;
         }
+        gridCtrl.gridstack.locked(element, false);
         element.removeClass('panel-fullscreen');
       }, scope);
 
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 82e24e72d5d..4f8ee509599 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -218,15 +218,14 @@ export class PanelCtrl {
   }
 
   replacePanel(newPanel, oldPanel) {
-    var row = this.row;
-    var index = _.indexOf(this.row.panels, oldPanel);
-    this.row.panels.splice(index, 1);
+    var index = _.indexOf(this.dashboard.panels, oldPanel);
+    this.dashboard.panels.splice(index, 1);
 
     // adding it back needs to be done in next digest
     this.$timeout(() => {
       newPanel.id = oldPanel.id;
-      newPanel.span = oldPanel.span;
-      this.row.panels.splice(index, 0, newPanel);
+      newPanel.width = oldPanel.width;
+      this.dashboard.panels.splice(index, 0, newPanel);
     });
   }
 
diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts
index 8b3dca60d3d..56dd7a63236 100644
--- a/public/app/plugins/panel/gettingstarted/module.ts
+++ b/public/app/plugins/panel/gettingstarted/module.ts
@@ -104,7 +104,7 @@ class GettingStartedPanelCtrl extends PanelCtrl {
   }
 
   dismiss() {
-    this.row.removePanel(this.panel, false);
+    this.dashboard.removePanel(this.panel, false);
 
     this.backendSrv.request({
       method: 'PUT',
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index c6d883ab404..82f3e4c7944 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -225,6 +225,9 @@ div.flot-text {
 
   .panel-fullscreen {
     display: block !important;
+    > .ui-resizable-handle {
+      display: none !important;
+    }
   }
 }