diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 4637f01691e..24977bd386c 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -156,7 +156,7 @@ module.directive('grafanaPanel', function($rootScope) {
             content: function() {
               return ctrl.getInfoContent({mode: 'tooltip'});
             },
-            position: 'right middle',
+            position: 'top center',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             hoverOpenDelay: 100,
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 23283e98591..0c5d72c7274 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -566,7 +566,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
         if (!linkInfo) { return;}
 
         drilldownTooltip.text('click to go to: ' + linkInfo.title);
-        drilldownTooltip.place_tt(e.pageX+20, e.pageY-15);
+        drilldownTooltip.place_tt(e.pageX, e.pageY-50);
       });
     }