diff --git a/framework/core/js/forum/src/components/Search.js b/framework/core/js/forum/src/components/Search.js
index b4dc07596..afc1cf91c 100644
--- a/framework/core/js/forum/src/components/Search.js
+++ b/framework/core/js/forum/src/components/Search.js
@@ -77,6 +77,7 @@ export default class Search extends Component {
     return (
       <div className={'Search ' + classList({
         open: this.value() && this.hasFocus,
+        focused: this.hasFocus,
         active: !!currentSearch,
         loading: !!this.loadingSources
       })}>
diff --git a/framework/core/less/lib/App.less b/framework/core/less/lib/App.less
index f49cb630c..9148271de 100755
--- a/framework/core/less/lib/App.less
+++ b/framework/core/less/lib/App.less
@@ -266,6 +266,18 @@
   }
 }
 
+@media @tablet {
+  .Header-secondary .Search {
+    input {
+      width: 1px;
+      background: transparent;
+    }
+    &:not(.active) input {
+      padding-right: 0;
+    }
+  }
+}
+
 // ------------------------------------
 // Content Area
 
diff --git a/framework/core/less/lib/Search.less b/framework/core/less/lib/Search.less
index bbb90e034..ccad7be8c 100755
--- a/framework/core/less/lib/Search.less
+++ b/framework/core/less/lib/Search.less
@@ -2,8 +2,11 @@
   position: relative;
 }
 @media @tablet-up {
-  .Search {
-    input:focus, &.active input, .Search-results {
+  .Search.focused {
+    margin-left: -400px;
+    .transition(all 0.4s);
+
+    input, .Search-results {
       width: 400px;
     }
   }
@@ -51,9 +54,9 @@
   input {
     float: left;
     width: 225px;
-    padding-left: 36px;
-    padding-right: 36px;
-    .transition(~"all 0.4s");
+    padding-left: 32px;
+    padding-right: 32px;
+    .transition(all 0.4s);
   }
   .Button {
     float: left;