diff --git a/public/app/plugins/panel/graph/legend.ts b/public/app/plugins/panel/graph/legend.ts
index 0c8852bf55a..7a9c75d4f1d 100644
--- a/public/app/plugins/panel/graph/legend.ts
+++ b/public/app/plugins/panel/graph/legend.ts
@@ -227,6 +227,8 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
       }
 
       function renderLegendElement(tableHeaderElem) {
+        let legendWidth = elem.width();
+
         var seriesElements = renderSeriesLegendElements();
 
         if (panel.legend.alignAsTable) {
@@ -238,7 +240,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
           elem.append(seriesElements);
         }
 
-        if (!panel.legend.rightSide) {
+        if (!panel.legend.rightSide || (panel.legend.rightSide && legendWidth !== 10)) {
           addScrollbar();
         } else {
           destroyScrollbar();
diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
index c00af05140a..48d88872074 100644
--- a/public/sass/components/_panel_graph.scss
+++ b/public/sass/components/_panel_graph.scss
@@ -6,11 +6,11 @@
   &--legend-right {
     @include media-breakpoint-up(sm) {
       flex-direction: row;
-    }
 
-    .graph-legend {
-      flex: 0 1 10px;
-      max-height: 100%;
+      .graph-legend {
+        flex: 0 1 10px;
+        max-height: 100%;
+      }
     }
 
     .graph-legend-series {