diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 93ed3ebc08d..1313294b83f 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -22,7 +22,9 @@ var panelTemplate = `
 
     <div class="panel-content">
       <div gemini-scrollbar ng-if="ctrl.scrollable">
-        <ng-transclude></ng-transclude>
+        <div class="panel-content--scrollable">
+          <ng-transclude></ng-transclude>
+        </div>
       </div>
       <ng-transclude ng-if="!ctrl.scrollable"></ng-transclude>
     </div>
diff --git a/public/sass/components/_panel_dashlist.scss b/public/sass/components/_panel_dashlist.scss
index 3fd37a1bed6..ecd2caeab4e 100644
--- a/public/sass/components/_panel_dashlist.scss
+++ b/public/sass/components/_panel_dashlist.scss
@@ -7,12 +7,6 @@
   margin-bottom: $spacer;
 }
 
-.dashlist {
-  // Add space for scrollbar
-  margin-right: 6px;
-  margin-left: 4px;
-}
-
 .dashlist-link {
   display: block;
   margin: 5px;
@@ -31,5 +25,3 @@
     background-color: $tight-form-func-bg;
   }
 }
-
-
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 0549d5f6dda..732102493fa 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -39,6 +39,12 @@ div.flot-text {
 .panel-content {
   padding: 0px 10px 5px 10px;
   height: 100%;
+
+  &--scrollable {
+    // Add space for scrollbar
+    padding-right: 10px;
+    padding-left: 6px;
+  }
 }
 
 .panel-title-container {