diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 55b1cfaadc2..073fa240bf8 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -109,7 +109,6 @@ export class KeybindingSrv {
       }
 
       scope.appEvent('hide-dash-editor');
-
       scope.exitFullscreen();
     });
   }
diff --git a/public/app/features/dashboard/all.js b/public/app/features/dashboard/all.js
index 88401000fb9..8359338fa02 100644
--- a/public/app/features/dashboard/all.js
+++ b/public/app/features/dashboard/all.js
@@ -5,7 +5,6 @@ define([
   './dashnav/dashnav',
   './submenu/submenu',
   './saveDashboardAsCtrl',
-  './rowCtrl',
   './shareModalCtrl',
   './shareSnapshotCtrl',
   './dashboard_srv',
diff --git a/public/app/features/dashboard/row/row.html b/public/app/features/dashboard/row/row.html
index 5728f77c950..b311a3b07ba 100644
--- a/public/app/features/dashboard/row/row.html
+++ b/public/app/features/dashboard/row/row.html
@@ -40,8 +40,8 @@
   </div>
 </div>
 
-<div ng-if="!ctrl.dashboard.editMode && ctrl.row.showTitle">
-  <div class="dash-row-header">
+<div ng-if="!ctrl.dashboard.editMode">
+  <div class="dash-row-header" ng-if="ctrl.showtitle">
     <a class="dash-row-header-title" ng-click="ctrl.toggleCollapse()">
       <span class="dash-row-collapse-toggle pointer">
         <i class="fa fa-chevron-down" ng-show="!ctrl.row.collapse"></i>
@@ -53,7 +53,7 @@
 </div>
 
 <div class="panels-wrapper" ng-if="!ctrl.row.collapse">
-  <div ng-repeat="panel in ctrl.row.panels track by panel.id" class="panel" ui-draggable="ctrl.dashboard.editMode" drag="panel.id" ui-on-drop="ctrl.onDrop($data, panel)" drag-handle-class="drag-handle" panel-width>
+  <div ng-repeat="panel in ctrl.row.panels track by panel.id" class="panel" ui-draggable="!ctrl.dashboard.meta.fullscreen" drag="panel.id" ui-on-drop="ctrl.onDrop($data, panel)" drag-handle-class="drag-handle" panel-width>
     <plugin-component type="panel" class="panel-margin">
     </plugin-component>
   </div>