diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 2533ac03739..75a84cca2bf 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -97,6 +97,7 @@ export class VariableEditorCtrl {
     };
 
     $scope.runQuery = function() {
+      $scope.optionsLimit = 20;
       return variableSrv.updateOptions($scope.current).catch(err => {
         if (err.data && err.data.message) {
           err.message = err.data.message;
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 74cb2f23e84..0d8b0ace327 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -286,7 +286,7 @@
           <span class="gf-form-label">{{option.text}}</span>
         </div>
         <div class="gf-form" ng-if= "current.options.length > optionsLimit">
-          <span class="gf-form-label btn-secondary" ng-click="showMoreOptions()">Show more</span>
+          <a class="gf-form-label btn-secondary" ng-click="showMoreOptions()">Show more</a>
         </div>
 			</div>
 		</div>