diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index b59f18ce243f..888655f7d59f 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -4545,7 +4545,6 @@ button.module-image__border-overlay:focus {
 }
 
 .module-message-body__at-mention {
-  background-color: $color-black-alpha-40;
   border-radius: 4px;
   cursor: pointer;
   display: inline-block;
@@ -4553,6 +4552,14 @@ button.module-image__border-overlay:focus {
   padding-right: 4px;
   border: 1px solid transparent;
 
+  @include light-theme {
+    background-color: $color-gray-20;
+  }
+
+  @include dark-theme {
+    background-color: $color-black-alpha-40;
+  }
+
   &:focus {
     border: 1px solid $color-black;
     outline: none;