diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 6f50c87..5923e92 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -114,7 +114,7 @@
 
             <div class="clear"></div>
 
-            <div class="pull-left">
+            <div class="pull-left left-buttons">
               {{#if everEditing}}
                 {{d-button action=(action "save") label="explorer.save" disabled=saveDisable}}
               {{else}}
@@ -128,7 +128,7 @@
               {{/if}}
             </div>
 
-            <div class="pull-right">
+            <div class="pull-right right-buttons">
               {{#if selectedItem.destroyed}}
                 {{d-button action=(action "recover") class="" icon="undo" label="explorer.recover"}}
               {{else}}
diff --git a/assets/javascripts/discourse/templates/components/explorer-schema.hbs b/assets/javascripts/discourse/templates/components/explorer-schema.hbs
index 75c08db..ee38002 100644
--- a/assets/javascripts/discourse/templates/components/explorer-schema.hbs
+++ b/assets/javascripts/discourse/templates/components/explorer-schema.hbs
@@ -1,6 +1,8 @@
 <div class={{if hideSchema "hidden"}}>
-  {{text-field value=filter placeholderKey="explorer.schema.filter"}}
-  {{d-button action=(action "collapseSchema") icon="chevron-right" class="no-text"}}
+  <div class="schema-search inline-form full-width">
+    {{text-field value=filter placeholderKey="explorer.schema.filter"}}
+    {{d-button action=(action "collapseSchema") icon="chevron-right" class="no-text"}}
+  </div>
   {{conditional-loading-spinner condition=loading}}
   <div class="schema-container">
     <ul>
diff --git a/assets/stylesheets/explorer.scss b/assets/stylesheets/explorer.scss
index 7a9b980..5a8ebaf 100644
--- a/assets/stylesheets/explorer.scss
+++ b/assets/stylesheets/explorer.scss
@@ -77,13 +77,10 @@ table.group-reports {
       overflow-y: scroll;
       overflow-x: hidden;
       color: var(--primary-high);
-      font-size: $font-down-2;
+      font-size: var(--font-down-1);
 
-      input {
-        padding: 4px;
-        margin: 3px;
-        // 100% - padding + margin * 2 - border - button - buttonborder
-        width: calc(100% - 14px - 1px - 40px - 2px);
+      .schema-search {
+        margin: 0.5em;
       }
       .schema-table-name {
         font-weight: bold;
@@ -205,7 +202,6 @@ table.group-reports {
   .name input,
   .desc textarea {
     width: 100%;
-    box-sizing: border-box;
     margin: 0;
   }
   &:not(.editing) .desc {
@@ -304,7 +300,7 @@ table.group-reports {
 
 .query-list {
   display: flex;
-  max-height: 30px;
+  align-items: flex-start;
   .btn-left {
     margin-right: 0.5em;
   }
@@ -424,3 +420,17 @@ table.group-reports {
     z-index: 1;
   }
 }
+
+.left-buttons,
+.right-buttons {
+  display: flex;
+  align-items: flex-start;
+}
+
+.left-buttons .btn {
+  margin-right: 0.5em;
+}
+
+.right-buttons .btn {
+  margin-left: 0.5em;
+}