diff --git a/lib/default-theme/NavLinks.vue b/lib/default-theme/NavLinks.vue
index 5b19cb9d60..11f72dd05b 100644
--- a/lib/default-theme/NavLinks.vue
+++ b/lib/default-theme/NavLinks.vue
@@ -117,12 +117,10 @@ export default {
   .repo-link
     margin-left 1.5rem
 
-@media (max-width: $MQMobile)
+@media (min-width: $MQMobile)
   .nav-links
     .nav-item, .repo-link
-      margin-left 0
-
-@media (min-width: $MQMobile)
+      margin-left 0.75rem
   .nav-links a
     &:hover, &.router-link-active
       color $textColor
@@ -130,4 +128,9 @@ export default {
     &:hover, &.router-link-active
       margin-bottom -2px
       border-bottom 2px solid lighten($accentColor, 8%)
+
+@media (min-width: $MQNarrow)
+  .nav-links
+    .nav-item, .repo-link
+      margin-left 1.5rem
 </style>
diff --git a/lib/default-theme/SearchBox.vue b/lib/default-theme/SearchBox.vue
index 395bdce4f9..f5cda7cafd 100644
--- a/lib/default-theme/SearchBox.vue
+++ b/lib/default-theme/SearchBox.vue
@@ -184,29 +184,48 @@ export default {
       a
         color $accentColor
 
-@media (max-width: $MQNarrow)
+@media (max-width: $MQMobile)
   .search-box
+    margin-right 0
+    display inline-block
     input
+      position relative
+      left 1rem
       cursor pointer
       width 0
       border-color transparent
-      position relative
-      left 1rem
+      background-color white
+      z-index 10
       &:focus
         cursor text
-        left 0
         width 10rem
+    suggestions:
+      rigt 0
 
-@media (max-width: $MQNarrow) and (min-width: $MQMobile)
+@media (min-width: $MQMobile) and (max-width: $MQNarrow)
   .search-box
-    .suggestions
+    position relative
+    display inline-block
+    width 30px
+    height 23px
+    margin-right 0
+    input
+      cursor pointer
+      width 0
+      border-color transparent
+      position absolute
+      background-color white
+      z-index 10
       left 0
+      top 0
+      &:focus
+        cursor text
+        width 10rem
 
-@media (max-width: $MQMobile)
+@media (max-width: $MQNarrow) and (min-width: $MQMobile)
   .search-box
-    margin-right 0
     .suggestions
-      right 0
+      left 0
 
 @media (max-width: $MQMobileNarrow)
   .search-box