diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 068c9bec777..35ea141d03c 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -158,6 +158,11 @@ export function grafanaAppDirective() {
         }
       });
 
+      // tooltip removal fix
+      scope.$on("$routeChangeSuccess", function() {
+        $("#tooltip, .tooltip").remove();
+      });
+
       // handle document clicks that should hide things
       elem.click(function(evt) {
         if ($(evt.target).parents().length === 0) {
diff --git a/public/app/core/directives/body_class.js b/public/app/core/directives/body_class.js
index fdee7ed4752..73426c60e00 100644
--- a/public/app/core/directives/body_class.js
+++ b/public/app/core/directives/body_class.js
@@ -12,11 +12,6 @@ function (_, $, coreModule) {
 
         var lastHideControlsVal;
 
-        // tooltip removal fix
-        $scope.$on("$routeChangeSuccess", function() {
-          $("#tooltip, .tooltip").remove();
-        });
-
         $scope.$watch('dashboard.hideControls', function() {
           if (!$scope.dashboard) {
             return;