diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 88a38eeaea8..e6a325c512c 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -51,8 +51,9 @@ function (angular, _) {
       $scope.exitFullscreen();
     };
 
-    $scope.removeToolTip = function() {
+    $scope.manageButtonClickAction = function() {
       $('.tooltip').not(this).hide();
+      $scope.appEvent('hide-dash-search');
     };
 
     $scope.saveDashboard = function(options) {
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 98396cd4359..e99191b0054 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" ng-click="removeToolTip()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a 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>