diff --git a/src/ui/Popup.module.css b/src/ui/Popup.module.css
index 4b26708f..d88ffd5d 100644
--- a/src/ui/Popup.module.css
+++ b/src/ui/Popup.module.css
@@ -1,9 +1,11 @@
 .popup {
   z-index: var(--z-popup);
-  outline: none;
   overflow: auto;
   opacity: 0;
 }
+.popup:focus-visible {
+  outline: none;
+}
 .popup[data-positioned] {
   opacity: 1;
   animation: popIn var(--dur-fast) var(--ease);
diff --git a/src/ui/Select.module.css b/src/ui/Select.module.css
index b4cf24e7..af3badc5 100644
--- a/src/ui/Select.module.css
+++ b/src/ui/Select.module.css
@@ -57,10 +57,13 @@
   overflow: hidden;
 }
 .popupInner {
-  outline: none;
   display: flex;
   flex-direction: column;
 }
+/* Focus only carries keystrokes; the active row is the indicator. */
+.popupInner:focus-visible {
+  outline: none;
+}
 .list {
   max-height: 320px;
 }