diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
index e2344c35777..6e639de569c 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@@ -81,15 +81,15 @@ export class PanelHeader extends Component<Props, State> {
 
     return (
       <>
-        <PanelHeaderCorner
-          panel={panel}
-          title={panel.title}
-          description={panel.description}
-          scopedVars={panel.scopedVars}
-          links={panel.links}
-          error={error}
-        />
         <div className={panelHeaderClass}>
+          <PanelHeaderCorner
+            panel={panel}
+            title={panel.title}
+            description={panel.description}
+            scopedVars={panel.scopedVars}
+            links={panel.links}
+            error={error}
+          />
           <div
             className="panel-title-container"
             onClick={this.onMenuToggle}
diff --git a/public/sass/components/_panel_header.scss b/public/sass/components/_panel_header.scss
index 3d6b52dc719..40afc2cd3aa 100644
--- a/public/sass/components/_panel_header.scss
+++ b/public/sass/components/_panel_header.scss
@@ -126,6 +126,7 @@ $panel-header-no-title-zindex: 1;
   left: 0;
   width: $panel-header-height;
   height: $panel-header-height;
+  z-index: $panel-header-no-title-zindex + 1;
   top: 0;
 
   .fa {
@@ -138,7 +139,8 @@ $panel-header-no-title-zindex: 1;
 
   &--info {
     display: block;
-    @include panel-corner-color(lighten($panel-corner, 4%));
+    @include panel-corner-color(lighten($panel-corner, 6%));
+
     .fa:before {
       content: '\f129';
     }
@@ -146,7 +148,7 @@ $panel-header-no-title-zindex: 1;
 
   &--links {
     display: block;
-    @include panel-corner-color(lighten($panel-corner, 4%));
+    @include panel-corner-color(lighten($panel-corner, 6%));
     .fa {
       left: 4px;
     }