diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
index 621b86dd3a8..a0a0a677a94 100644
--- a/src/app/panels/filtering/module.html
+++ b/src/app/panels/filtering/module.html
@@ -6,11 +6,10 @@
     .filter-panel-filter {
       display:inline-block;
       vertical-align: top;
-      margin-left: 10px;
       width: 220px;
       padding: 5px 5px 0px 5px;
       border: #555 1px solid;
-      margin: 0px 5px 5px 0px;
+      margin: 5px 5px 5px 0px;
     }
     .filter-panel-filter ul {
       margin-bottom: 3px;
diff --git a/src/app/panels/query/module.html b/src/app/panels/query/module.html
index c346544f7fc..3ae1d0c6bdb 100644
--- a/src/app/panels/query/module.html
+++ b/src/app/panels/query/module.html
@@ -1,6 +1,6 @@
 <div ng-controller='query' ng-init="init()" class="query-panel">
   <div ng-repeat="id in (unPinnedQueries = (querySrv.ids|pinnedQuery:false))" ng-class="{'short-query': unPinnedQueries.length>1}">
-    <form class="form-search" style="position:relative;margin-bottom:5px;" ng-submit="refresh()">
+    <form class="form-search" style="position:relative;margin:5px 0;" ng-submit="refresh()">
       <span class="begin-query">
         <i class="pointer" ng-class="queryIcon(querySrv.list[id].type)" ng-show="querySrv.list[id].enable" data-unique="1" bs-popover="'app/panels/query/meta.html'" data-placement="bottomLeft" ng-style="{color: querySrv.list[id].color}"></i>
         <i class="pointer icon-circle-blank" ng-click="querySrv.list[id].enable=true;dashboard.refresh();" ng-hide="querySrv.list[id].enable" bs-tooltip="'Activate query'" ng-style="{color: querySrv.list[id].color}"></i>