diff --git a/public/app/directives/bodyClass.js b/public/app/directives/bodyClass.js
index 20339b8bf92..d0274aca6b2 100644
--- a/public/app/directives/bodyClass.js
+++ b/public/app/directives/bodyClass.js
@@ -1,8 +1,9 @@
 define([
   'angular',
-  'lodash'
+  'lodash',
+  'jquery'
 ],
-function (angular, _) {
+function (angular, _, $) {
   'use strict';
 
   angular
@@ -13,6 +14,11 @@ function (angular, _) {
 
           var lastHideControlsVal;
 
+          // tooltip removal fix
+          $scope.$on("$routeChangeSuccess", function() {
+            $("#tooltip").remove();
+          });
+
           $scope.$watch('submenuEnabled', function() {
             if (!$scope.dashboard) {
               return;