diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 3db2277..3b05284 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2763,11 +2763,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #404552;
-  border-bottom: 1px solid #2b2e39; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #2b2e39; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #404552; }
 
 .nautilus-window notebook {
   background-color: #404552; }
@@ -3514,10 +3515,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #2b2e39; }
-
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 167c088..1c63f71 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2762,11 +2762,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #ffffff;
-  border-bottom: 1px solid #dcdfe3; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff; }
 
 .nautilus-window notebook {
   background-color: #ffffff; }
@@ -3513,10 +3514,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
-
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 3d85156..6fece18 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2763,11 +2763,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #404552;
-  border-bottom: 1px solid #2b2e39; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #2b2e39; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #404552; }
 
 .nautilus-window notebook {
   background-color: #404552; }
@@ -3514,10 +3515,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #2b2e39; }
-
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index fb8ee12..dd605ff 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2762,11 +2762,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #ffffff;
-  border-bottom: 1px solid #dcdfe3; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff; }
 
 .nautilus-window notebook {
   background-color: #ffffff; }
@@ -3513,10 +3514,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
-
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 4894e1d..140e205 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2766,11 +2766,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #ffffff;
-  border-bottom: 1px solid #dcdfe3; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff; }
 
 .nautilus-window notebook {
   background-color: #ffffff; }
@@ -3517,10 +3518,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
-
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 3d9ce93..d805ada 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2766,11 +2766,12 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   .nautilus-list-dim-label:selected:focus {
     color: #dceaf9; }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
-  background-color: #ffffff;
-  border-bottom: 1px solid #dcdfe3; }
+.nautilus-window searchbar {
+  border-color: transparent;
+  box-shadow: inset 0 -1px #dcdfe3; }
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff; }
 
 .nautilus-window notebook {
   background-color: #ffffff; }
@@ -3517,10 +3518,6 @@ GtkListBox .h4 {
   .nautilus-window button.sidebar-button:not(:hover):not(:active) > image {
     opacity: 0.5; }
 
-.nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
-
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index f47a285..8fcb0a7 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -110,11 +110,14 @@
   &:selected, &:selected:focus { color: mix($selected_fg_color, $selected_bg_color, 80%); }
 }
 
-.nautilus-window .search-bar {
-  padding: 5px;
-  box-shadow: none;
+.nautilus-window searchbar {
+  // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096
+  border-color: transparent;
+  box-shadow: inset 0 -1px $borders_color;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: $base_color;
-  border-bottom: 1px solid $borders_color;
 }
 
 .nautilus-window notebook {
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index ed3f0db..26238af 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -54,12 +54,6 @@
 
     &:not(:hover):not(:active) > image { opacity: 0.5 };
   }
-
-  searchbar {
-    // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096
-    border-color: transparent;
-    box-shadow: inset 0 -1px $borders_color;
-  }
 }