diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js
index 9e3c87fde3d..5709c1dddf2 100644
--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
@@ -18,7 +18,7 @@ function (angular, $, config) {
       '<div class="panel-header">'+
           '<span class="alert-error panel-error small pointer"' +
                 'config-modal="app/partials/inspector.html" ng-if="panelMeta.error">' +
-            '<span data-placement="right" bs-tooltip="panelMeta.error">' +
+            '<span data-placement="top" bs-tooltip="panelMeta.error">' +
             '<i class="icon-exclamation-sign"></i><span class="panel-error-arrow"></span>' +
             '</span>' +
           '</span>' +
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 7d00e2d9cec..8ff4a50c01b 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -62,6 +62,7 @@
   left: 0;
   padding: 0px 17px 6px 5px;
   top: 0;
+  z-index: 10;
   i {
     position: relative;
     top: -2px;