diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 1b193ecc2dc..08f9fd5576a 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -28,9 +28,9 @@ var panelTemplate = `
   <div class="panel-full-edit" ng-if="ctrl.editMode">
     <div class="tabbed-view tabbed-view--panel-edit">
       <div class="tabbed-view-header">
-        <h2 class="tabbed-view-title">
+        <h3 class="tabbed-view-panel-title">
           {{ctrl.pluginName}}
-        </h2>
+        </h3>
 
         <ul class="gf-tabs">
           <li class="gf-tabs-item" ng-repeat="tab in ::ctrl.editorTabs">
diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss
index 756462a4b70..d831f54a0c3 100644
--- a/public/sass/components/_tabbed_view.scss
+++ b/public/sass/components/_tabbed_view.scss
@@ -1,5 +1,4 @@
 .tabbed-view {
-  background-color: $panel-bg;
   padding: $spacer*3;
   margin-bottom: $dashboard-padding;
 
@@ -7,9 +6,9 @@
     padding: 0;
 
     .tabbed-view-header {
-      background-color: $body-bg;
       padding: 1.5em 1rem 0 1rem;
     }
+
     .gf-tabs-link.active {
       background-color: $panel-bg;
     }
@@ -23,11 +22,16 @@
 
 .tabbed-view-title {
   float: left;
-  font-style: italic;
   padding-top: 0.5rem;
   margin: 0 $spacer*3 0 $spacer*1;
 }
 
+.tabbed-view-panel-title {
+  float: left;
+  padding-top: 1rem;
+  margin: 0 2rem 0 0;
+}
+
 .tabbed-view-close-btn {
   float: right;
   padding: 0;
@@ -45,6 +49,7 @@
 }
 
 .tabbed-view-body {
+  background-color: $panel-bg;
   padding: $spacer*2 $spacer;
   min-height: 250px;