diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index fdde47f..9680a81 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -1,5 +1,3 @@
-<h2>Queries</h2>
-
 <div class="query-list">
   {{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" content=content castInteger="true" nameChanges="true"}}
   {{d-button action="showCreate" icon="plus" class="no-text"}}
@@ -101,9 +99,6 @@
         {{/each}}
       </div>
     {{/if}}
-    <div class="bool-options">
-      <label>{{input type="checkbox" checked=explain name="explain"}} {{i18n "explorer.explain_label"}}</label>
-    </div>
     {{#if runDisabled}}
       {{#if saveDisabled}}
         {{d-button label="explorer.run" disabled="true" class="btn-primary"}}
@@ -113,6 +108,7 @@
     {{else}}
       {{d-button action="run" label="explorer.run" disabled=runDisabled class="btn-primary" type="submit"}}
     {{/if}}
+    <label class="query-plan">{{input type="checkbox" checked=explain name="explain"}} {{i18n "explorer.explain_label"}}</label>
   </form>
 
   <hr>
diff --git a/assets/stylesheets/explorer.scss b/assets/stylesheets/explorer.scss
index e3c7864..37c6cf4 100644
--- a/assets/stylesheets/explorer.scss
+++ b/assets/stylesheets/explorer.scss
@@ -150,6 +150,14 @@
   }
 }
 
+.query-run {
+  margin-top: 15px;
+  .query-plan {
+    display: inline-block;
+    margin-left: 15px;
+  }
+}
+
 .clear { clear: both; }
 
 .schema-title {