diff --git a/public/app/plugins/panels/graph/axisEditor.html b/public/app/plugins/panels/graph/axisEditor.html
index d8a537dda46..13bc78b7dfe 100644
--- a/public/app/plugins/panels/graph/axisEditor.html
+++ b/public/app/plugins/panels/graph/axisEditor.html
@@ -181,6 +181,13 @@
 				<li class="tight-form-item">
 					<editor-checkbox text="Right side" model="panel.legend.rightSide" change="render()"></editor-checkbox>
 				</li>
+				<li ng-if="panel.legend.rightSide" class="tight-form-item">
+					Side width
+				</li>
+				<li ng-if="panel.legend.rightSide" style="width: 105px">
+					<input type="number" class="input-small tight-form-input" placeholder="250" bs-tooltip="'Set a min-width for the legend side table/block'" data-placement="right"
+					ng-model="panel.legend.sideWidth" ng-change="render()" ng-model-onblur>
+				</li>
 			</ul>
 			<div class="clearfix"></div>
 		</div>
diff --git a/public/app/plugins/panels/graph/legend.js b/public/app/plugins/panels/graph/legend.js
index 4f4a0d8ee06..2d3f8ac3b90 100644
--- a/public/app/plugins/panels/graph/legend.js
+++ b/public/app/plugins/panels/graph/legend.js
@@ -101,6 +101,10 @@ function (angular, _, $) {
 
           $container.empty();
 
+          // Set min-width if side style and there is a value, otherwise remove the CSS propery
+          var width = panel.legend.rightSide && panel.legend.sideWidth ? panel.legend.sideWidth + "px" : "";
+          $container.css("min-width", width);
+
           $container.toggleClass('graph-legend-table', panel.legend.alignAsTable === true);
 
           if (panel.legend.alignAsTable) {