Opening search closes fullscreen edit or fullscreen view

public/app/controllers/search.js

@@ -17,6 +17,10 @@ function (angular, _, config) {
       $scope.query = { query: '', tag: '', starred: false };
       $scope.currentSearchId = 0;
 
+      if ($scope.dashboardViewState.fullscreen) {
+        $scope.exitFullscreen();
+      }
+
       $timeout(function() {
         $scope.giveSearchFocus = $scope.giveSearchFocus + 1;
         $scope.query.query = '';

public/app/features/panel/panelSrv.js

@@ -16,12 +16,7 @@ function (angular, _, config) {
       $scope.inspector = {};
 
       $scope.editPanel = function() {
-        if ($scope.panelMeta.fullscreen) {
-          $scope.toggleFullscreen(true);
-        }
-        else {
-          $scope.appEvent('show-dash-editor', { src: 'app/partials/paneleditor.html', scope: $scope });
-        }
+        $scope.toggleFullscreen(true);
       };
 
       $scope.sharePanel = function() {

public/app/features/panel/partials/panel.html

@@ -32,7 +32,7 @@
 			</div>
 
 			<button class="gf-box-header-close-btn" ng-click="exitFullscreen();">
-				<i class="fa fa-remove"></i>
+				Back to dashboard
 			</button>
 		</div>
 

public/app/partials/submenu.html

@@ -27,7 +27,6 @@
 			</li>
 		</ul>
 
-
 		<div class="clearfix"></div>
 	</div>
 </div>