diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js
index fe0ffe47e51..bb58e2dbc06 100644
--- a/public/app/features/dashboard/dynamicDashboardSrv.js
+++ b/public/app/features/dashboard/dynamicDashboardSrv.js
@@ -164,7 +164,7 @@ function (angular, _) {
 
       _.each(selected, function(option, index) {
         var copy = self.getPanelClone(panel, row, index);
-        copy.span = 12 / selected.length;
+        copy.span = Math.max(12 / selected.length, panel.minSpan);
         copy.scopedVars = copy.scopedVars || {};
         copy.scopedVars[variable.name] = option;
       });
diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html
index 02db54cd6c6..0d7cbb2c939 100644
--- a/public/app/partials/panelgeneral.html
+++ b/public/app/partials/panelgeneral.html
@@ -42,6 +42,14 @@
 						<option value=""></option>
 					</select>
 				</li>
+				<li class="tight-form-item">
+					Min span
+				</li>
+				<li>
+					<select class="input-small tight-form-input last" ng-model="panel.minSpan" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10,11,12]">
+						<option value=""></option>
+					</select>
+				</li>
 			</ul>
 			<div class="clearfix"></div>
 		</div>