diff --git a/frontend/src/assets/style.css b/frontend/src/assets/style.css
index a3927b8..e688c02 100644
--- a/frontend/src/assets/style.css
+++ b/frontend/src/assets/style.css
@@ -624,26 +624,26 @@ input[type="radio"] {
   cursor: pointer;
 }
 
-/* Dark mode form adjustments */
-@media (prefers-color-scheme: dark) {
-  .form-control {
-    background: var(--bg);
-    border-color: var(--border);
-  }
+/* Dark mode form adjustments. Scoped to the explicit theme attribute (the
+   theme store always stamps it at startup) - a bare prefers-color-scheme
+   query here leaks dark widget styles into light mode on dark-OS machines. */
+[data-theme="dark"] .form-control {
+  background: var(--bg);
+  border-color: var(--border);
+}
 
-  .form-control:focus {
-    background: var(--bg);
-    box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.2);
-  }
+[data-theme="dark"] .form-control:focus {
+  background: var(--bg);
+  box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.2);
+}
 
-  select.form-control {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%23999' d='M6 8L1 3h10z'/%3E%3C/svg%3E");
-    background-color: var(--bg);
-  }
+[data-theme="dark"] select.form-control {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%23999' d='M6 8L1 3h10z'/%3E%3C/svg%3E");
+  background-color: var(--bg);
+}
 
-  select.form-control option {
-    background: var(--text);
-  }
+[data-theme="dark"] select.form-control option {
+  background: var(--bg-card-solid);
 }
 
 /* Form grid */
@@ -1726,16 +1726,14 @@ td.actions .btn + .btn {
   text-decoration: underline;
 }
 
-@media (prefers-color-scheme: dark) {
-  .notification-item.type-incident {
-    background: rgba(245, 54, 92, 0.1);
-  }
-  .notification-item.type-change {
-    background: rgba(255, 136, 0, 0.1);
-  }
-  .notification-item.type-awareness {
-    background: rgba(4, 185, 98, 0.1);
-  }
+[data-theme="dark"] .notification-item.type-incident {
+  background: rgba(245, 54, 92, 0.1);
+}
+[data-theme="dark"] .notification-item.type-change {
+  background: rgba(255, 136, 0, 0.1);
+}
+[data-theme="dark"] .notification-item.type-awareness {
+  background: rgba(4, 185, 98, 0.1);
 }
 
 /* Light mode is now default, dark mode via prefers-color-scheme */