diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 27ce528f69e..7aeb095eff7 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -51,6 +51,11 @@ function (angular, _) {
       $scope.exitFullscreen();
     };
 
+    $scope.manageButtonClickAction = function() {
+      angular.element('#manageDashboardButton').tooltip('hide');
+      $scope.appEvent('hide-dash-search');
+    };
+
     $scope.saveDashboard = function(options) {
       if ($scope.dashboardMeta.canSave === false) {
         return;
diff --git a/public/app/features/dashboard/directives/dashSearchView.js b/public/app/features/dashboard/directives/dashSearchView.js
index ad73b84043c..a274568a031 100644
--- a/public/app/features/dashboard/directives/dashSearchView.js
+++ b/public/app/features/dashboard/directives/dashSearchView.js
@@ -54,7 +54,14 @@ function (angular, $) {
             hookUpHideWhenClickedOutside();
           }
 
+          function hideSearch() {
+            if (editorScope) {
+              editorScope.dismiss();
+            }
+          }
+
           scope.onAppEvent('show-dash-search', showSearch);
+          scope.onAppEvent('hide-dash-search', hideSearch);
         }
       };
     });
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index a68237122d1..f83779ba935 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -30,7 +30,7 @@
 					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
-					<a class="pointer" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a id="manageDashboardButton" class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 					<ul class="dropdown-menu">
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>