diff --git a/css/sass/_screen.scss b/css/sass/_screen.scss
index 0ca2a29..fbdece5 100644
--- a/css/sass/_screen.scss
+++ b/css/sass/_screen.scss
@@ -434,7 +434,6 @@ a {
     min-height: 40px;
 /*    position:relative;
 */    .nav-menu {
-        overflow: auto;
         background-color:lighten($grey-light, 5%);
         .active {
             background-color: lighten($accent-main, 10%);
@@ -640,14 +639,19 @@ button,
     }
 }
 
-.with-advanced input[type=text] {
-    @include calc(width, "100% - 76px");
+#search-container.with-advanced input[type=text] {
+    @include calc(width, "100% - 72px");
+    position: relative;
 }
 
 #search-container button.show-advanced {
     right: 1.5 * $base-line-height;
 }
 
+#search-container *:focus {
+    z-index: 1;
+}
+
 #search-filters,
 #item-filters {
     ul {
diff --git a/css/style.css b/css/style.css
index 10bdc02..e2a241f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -906,7 +906,6 @@ a:focus {
   */
 }
 #top-nav .nav-menu {
-  overflow: auto;
   background-color: #eaeaea;
 }
 #top-nav .nav-menu .active {
@@ -1111,14 +1110,19 @@ button:active,
   margin-bottom: 0;
 }
 
-.with-advanced input[type=text] {
-  width: calc(100% - 76px);
+#search-container.with-advanced input[type=text] {
+  width: calc(100% - 72px);
+  position: relative;
 }
 
 #search-container button.show-advanced {
   right: 36px;
 }
 
+#search-container *:focus {
+  z-index: 1;
+}
+
 #search-filters ul,
 #item-filters ul {
   list-style-type: none;