diff --git a/.jshintrc b/.jshintrc
index 7f4a90e2381..16904c42413 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -30,7 +30,6 @@
     "define": true,
     "require": true,
     "Chromath": false,
-    "setImmediate": true,
-    "$": false
+    "setImmediate": true
   }
 }
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index e6a325c512c..7aeb095eff7 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -52,7 +52,7 @@ function (angular, _) {
     };
 
     $scope.manageButtonClickAction = function() {
-      $('.tooltip').not(this).hide();
+      angular.element('#manageDashboardButton').tooltip('hide');
       $scope.appEvent('hide-dash-search');
     };
 
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index e99191b0054..42f39b0ab1b 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="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" 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>