diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index d8c74d1eea9..c7dfe61f2b4 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -217,10 +217,10 @@
 
       <div class="gf-form-group">
         <h5>Preview of values (shows max 20)</h5>
-        <div class="gf-form">
-          <span class="gf-form-label" ng-repeat="option in current.options | limitTo: 20">
-            {{option.text}}
-          </span>
+        <div class="gf-form-inline">
+          <div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
+            <span class="gf-form-label">{{option.text}}</span>
+          </div>
         </div>
       </div>
     </div>