diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 13a69c8..a70a55c 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -579,7 +579,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 493b71d..7bbc39f 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -578,7 +578,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
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 1b3f5d1..044882e 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -579,7 +579,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
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 a4e77cc..aa37387 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -578,7 +578,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 83f45b3..0dcd4ff 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -578,7 +578,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 3924291..38f67f5 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -578,7 +578,7 @@ button {
 .linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index ae3a0a8..75cfc1f 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -578,7 +578,7 @@ toolbar.inline-toolbar toolbutton {
   > button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
   > button:checked + button:not(:checked):not(:active):hover { box-shadow: none; }
   > button:checked + entry { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
-  > entry + button:not(:checked):not(:active):hover { box-shadow: none; }
+  > entry + button:not(:checked):not(:active):not(:only-child):hover { box-shadow: none; }
 }
 
 // special case for path-bars