diff --git a/app/assets/javascripts/navigation.js b/app/assets/javascripts/navigation.js
index 2e2628445..499251ed5 100644
--- a/app/assets/javascripts/navigation.js
+++ b/app/assets/javascripts/navigation.js
@@ -94,9 +94,20 @@
       });
   }
 
+  function focusSearchInput() {
+    var searchIco = $('#search-ico');
+    searchIco
+      .on('shown.bs.dropdown', function() {
+        searchIco
+          .find('input.form-control')
+          .focus();
+      });
+  }
+
   // init
   loadDropdownNotifications();
   loadUnseenNotificationsNumber();
   toggleNotificationBellPosition();
+  focusSearchInput();
   initGlobalSwitchForm();
 })();
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 7e29049dd..56ce9fbe3 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -563,6 +563,20 @@ a[data-toggle="tooltip"] {
   }
 }
 
+@media(max-width:1000px) {
+  .search-dropdown {
+    width: 270px;
+
+    .form-group {
+      padding-left: 15px;
+    }
+  }
+}
+
+@media(max-width:425px) {
+  .search-dropdown {}
+}
+
  // Global team switch
 #team-switch {
   border-left: 1px solid $color-alto;
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index 791d55719..8e216e9ae 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -87,6 +87,7 @@
                 </li>
               <% end %>
             <% end %>
+            <li role="separator" class="divider"></li>
             <li>
               <%= link_to new_organization_path do %>
                 <span class="glyphicon glyphicon-plus"></span>
@@ -98,7 +99,8 @@
         <% end %>
 
         <!-- search -->
-        <li class="dropdown">
+        <li class="dropdown"
+            id="search-ico">
           <a href="#"
              class="dropdown-toggle"
              data-toggle="dropdown"
@@ -120,8 +122,7 @@
                     <input class="form-control"
                            type="text"
                            name="q"
-                           placeholder="<%= t('nav.search') %>"
-                           autofocus>
+                           placeholder="<%= t('nav.search') %>">
                      <span class="input-group-btn visible-xs visible-sm">
                       <button id="search-button"
                               class="btn btn-default"