diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 98212225f25..aae301d43bb 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -132,7 +132,7 @@
 									Auto interval steps <tip>How many times should the current time range be divided to calculate the value</tip>
 								</li>
 								<li>
-									<select class="input-mini tight-form-input last" ng-model="current.auto_count" ng-options="f for f in [3,5,10,30,50,100,200]" ng-change="runQuery()"></select>
+									<select class="input-mini tight-form-input last" ng-model="current.auto_count" ng-options="f for f in [2,3,4,5,10,20,30,40,50,100,200,300,400,500]" ng-change="runQuery()"></select>
 								</li>
 							</ul>
 							<div class="clearfix"></div>