diff --git a/web/styles/app_components.css b/web/styles/app_components.css
index 38d29a3267..531db718cb 100644
--- a/web/styles/app_components.css
+++ b/web/styles/app_components.css
@@ -180,6 +180,16 @@ input::placeholder {
         background-color: var(--color-background-zulip-button-hover);
     }
 
+    &:focus {
+        /* Maintain no outline for pointer focus. */
+        outline: 0;
+    }
+
+    &:focus-visible {
+        /* Set Zulip outline style with keyboard/assistive focus. */
+        outline: 2px solid var(--color-outline-focus);
+    }
+
     &:active {
         color: inherit;
         background-color: var(--color-background-zulip-button-active);