diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 65a3724..e5f3d7a 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -941,7 +941,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3420,7 +3420,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 07bb4e6..5a744e7 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -940,7 +940,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3419,7 +3419,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
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 0b4c22c..b40ac45 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -941,7 +941,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3420,7 +3420,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
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 bed4d94..c60c869 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -940,7 +940,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3419,7 +3419,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 15e910d..b6fcb08 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -940,7 +940,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3423,7 +3423,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 2ef92da..e51faf7 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -940,7 +940,7 @@ paned.titlebar > headerbar:not(:only-child):not(:first-child):not(:last-child) {
 paned.titlebar > headerbar ~ headerbar {
   border-top-left-radius: 0; }
 
-paned.titlebar > headerbar:first-child:dir(ltr) {
+paned.titlebar > headerbar:first-child {
   border-top-right-radius: 0; }
 
 headerbar entry, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator {
@@ -3423,7 +3423,7 @@ GtkListBox .h4 {
     color: #BAC3CF; }
     .nautilus-window placessidebar.sidebar row.activatable .sidebar-icon {
       color: rgba(186, 195, 207, 0.6); }
-    .nautilus-window placessidebar.sidebar row.activatable:hover {
+    .nautilus-window placessidebar.sidebar row.activatable.has-open-popup, .nautilus-window placessidebar.sidebar row.activatable:hover {
       background-color: rgba(186, 195, 207, 0.15); }
     .nautilus-window placessidebar.sidebar row.activatable:selected .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar row.activatable:active:hover .sidebar-icon {
       color: inherit; }
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 42d08a4..3390c96 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -31,6 +31,7 @@
 
       .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); }
 
+      &.has-open-popup,
       &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); }
 
       &:selected, &:selected:hover, &:active:hover {