diff --git a/panels/query/module.html b/panels/query/module.html
index 450d8707398..ae71080abd5 100644
--- a/panels/query/module.html
+++ b/panels/query/module.html
@@ -54,9 +54,9 @@
       </span>
     </form>
   </div>
-  <div>
-    <span class="pointer" ng-click="panel.pinned = !panel.pinned"><small class="pins">Pinned</small> <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
-    <span ng-show="panel.pinned" ng-repeat="id in querySrv.ids|pinnedQuery:true" class="pinned badge">
+  <div style="display:inline-block" ng-repeat="id in querySrv.ids|pinnedQuery:true">
+    <span class="pointer" ng-show="$first" ng-click="panel.pinned = !panel.pinned"><small class="pins">Pinned</small> <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
+    <span ng-show="panel.pinned" class="pinned badge">
       <i class="icon-circle pointer" ng-style="{color: querySrv.list[id].color}" data-unique="1" bs-popover="'panels/query/meta.html'"></i><span bs-tooltip="querySrv.list[id].query"> {{querySrv.list[id].alias || querySrv.list[id].query}}</span>
     </span>
   </div>