diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 1d69607560..46eab928db 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -135,8 +135,8 @@ <h3>
                   <query-editor query="query"
                     schema="schema"
                     syntax="dataSource.syntax"></query-editor>
-
-                  <button type="button" class="btn btn-default btn-s btn__format pull-right" ng-click="formatQuery()" title="Format">
+                  <label class="btn__format pull-right">
+                  <button type="button" class="btn btn-default btn-s pull-right" ng-click="formatQuery()" title="Format">
                     <span class="zmdi zmdi-format-indent-increase"></span>
                   </button>
                   <input type="checkbox" ng-model="autocompleteQuery">