diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss b/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
index 41e10f7663..b84730ba80 100644
--- a/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_entries.scss
@@ -5,7 +5,10 @@ StEntry {
 
   StIcon.capslock-warning {
     icon-size: $scalable_icon_size;
-    warning-color: $warning_color;
+    // Yaru: in light themes, the PolKit popup is also light, so a
+    // darker color is required. In Gnome, the popup is dark in both
+    // themes.
+    warning-color: if($variant == 'light', $fg_color, $warning_color);
     padding: 0 $base_margin;
   }
 
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss b/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
index 0bc95adafa..57519e04be 100644
--- a/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
+++ b/gnome-shell/src/gnome-shell-sass/widgets/_misc.scss
@@ -41,7 +41,10 @@
   text-align: center;
   padding-bottom: 8px;
   @extend %caption;
-  color: $warning_color;
+  // Yaru: in light themes, the PolKit popup is also light, so a
+  // darker color is required. In Gnome, the popup is dark in both
+  // themes.
+  color: if($variant == 'light', $fg_color, $warning_color);
 }
 
 /* Workspace animation */