diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js
index 2148836ac12..092f50c72d5 100644
--- a/src/app/features/dashboard/dashboardNavCtrl.js
+++ b/src/app/features/dashboard/dashboardNavCtrl.js
@@ -53,6 +53,7 @@ function (angular, _, moment) {
 
     $scope.dashboardTitleAction = function() {
       $scope.appEvent('hide-dash-editor');
+      $scope.exitFullscreen();
     };
 
     $scope.saveDashboard = function(options) {
diff --git a/src/app/features/panel/partials/panel.html b/src/app/features/panel/partials/panel.html
index a89e586b492..d8b91bbeb85 100644
--- a/src/app/features/panel/partials/panel.html
+++ b/src/app/features/panel/partials/panel.html
@@ -30,6 +30,10 @@
 				<div ng-repeat="tab in panelMeta.editorTabs" data-title="{{tab.title}}">
 				</div>
 			</div>
+
+			<button class="gf-box-header-close-btn" ng-click="exitFullscreen();">
+				<i class="fa fa-remove"></i>
+			</button>
 		</div>
 
 		<div class="gf-box-body">
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 5f458ae1cdd..eb68f63ea5a 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -62,17 +62,10 @@
 			</ul>
 
 			<ul class="nav pull-right">
-				<li ng-show="dashboardViewState.fullscreen">
-					<a ng-click="exitFullscreen()">
-						Back to dashboard
-					</a>
-				</li>
-
 				<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable">
 					<grafana-simple-panel type="pulldown.type" ng-cloak>
 					</grafana-simple-panel>
 				</li>
-
 			</ul>
 		</div>
 	</div>