diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 94f5c45d2d..1f08eb38b8 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -285,7 +285,7 @@ entry {
 
     &:backdrop:disabled { @include entry(backdrop-insensitive); }
 
-    selection { &:focus, & { @extend %selected_items; }}
+    selection { @extend %selected_items; }
 
     // entry error and warning style
     @each $e_type, $e_color in (error, $error_color),
@@ -296,7 +296,7 @@ entry {
 
         &:focus { @include entry(focus, $e_color); }
 
-        &:selected { &:focus, & { background-color: $e_color; }}
+        selection { background-color: $e_color; }
       }
     }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9cdf9ba553..2723363e43 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -238,9 +238,8 @@ entry {
     entry.error:focus {
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #1a0000; }
-    spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
-    entry.error:selected:focus,
-    entry.error:selected {
+    spinbutton.error:not(.vertical) selection,
+    entry.error selection {
       background-color: #cc0000; }
   spinbutton.warning:not(.vertical),
   entry.warning {
@@ -250,9 +249,8 @@ entry {
     entry.warning:focus {
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #432100; }
-    spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
-    entry.warning:selected:focus,
-    entry.warning:selected {
+    spinbutton.warning:not(.vertical) selection,
+    entry.warning selection {
       background-color: #f57900; }
   spinbutton:not(.vertical) image,
   entry image {
@@ -4518,8 +4516,7 @@ textview text:selected:focus,
 iconview text:selected,
 textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
 textview text selection:focus,
-textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
-entry selection:focus,
+textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
 entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
 popover.background radiobutton:selected,
 .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
@@ -4532,8 +4529,7 @@ popover.background radiobutton:selected,
   iconview text:selected,
   textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
   textview text selection:focus,
-  textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
-  entry selection:focus,
+  textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
   entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
   popover.background radiobutton:selected,
   .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 44932bf433..de75ded51c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -238,9 +238,8 @@ entry {
     entry.error:focus {
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #cc0000; }
-    spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
-    entry.error:selected:focus,
-    entry.error:selected {
+    spinbutton.error:not(.vertical) selection,
+    entry.error selection {
       background-color: #cc0000; }
   spinbutton.warning:not(.vertical),
   entry.warning {
@@ -250,9 +249,8 @@ entry {
     entry.warning:focus {
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #f57900; }
-    spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
-    entry.warning:selected:focus,
-    entry.warning:selected {
+    spinbutton.warning:not(.vertical) selection,
+    entry.warning selection {
       background-color: #f57900; }
   spinbutton:not(.vertical) image,
   entry image {
@@ -4549,8 +4547,7 @@ textview text:selected:focus,
 iconview text:selected,
 textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
 textview text selection:focus,
-textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
-entry selection:focus,
+textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
 entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
 popover.background radiobutton:selected,
 .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
@@ -4563,8 +4560,7 @@ popover.background radiobutton:selected,
   iconview text:selected,
   textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
   textview text selection:focus,
-  textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
-  entry selection:focus,
+  textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
   entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
   popover.background radiobutton:selected,
   .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {