diff --git a/static/styles/night_mode.scss b/static/styles/night_mode.scss
index 5c28cf521b..ee9fc15737 100644
--- a/static/styles/night_mode.scss
+++ b/static/styles/night_mode.scss
@@ -978,7 +978,7 @@ on a dark background, and don't change the dark labels dark either. */
         }
     }
 
-    div.popover-content a:focus {
+    a:not(:active):focus {
         outline-color: hsl(0, 0%, 100%);
     }
 }
diff --git a/static/styles/zulip.scss b/static/styles/zulip.scss
index 7074becc22..ab0280dc53 100644
--- a/static/styles/zulip.scss
+++ b/static/styles/zulip.scss
@@ -380,7 +380,7 @@ label {
 }
 
 /* Bootstrap's focus outline uses -webkit-focus-ring-color which doesn't exist in Firefox */
-div.popover-content a:focus {
+a:not(:active):focus {
     outline: 2px solid hsl(215, 47%, 50%);
     // TODO: change solid to auto once the Chromium bug #1105822 is fixed
 }