diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 2e8993eefff..9f0d62fbf7b 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -367,14 +367,14 @@ export default Component.extend({
   @bind
   _onTitleFocus() {
     if (this.element && !this.isDestroying && !this.isDestroyed) {
-      this._mainLinkElement().classList.add("focused");
+      this.element.classList.add("selected");
     }
   },
 
   @bind
   _onTitleBlur() {
     if (this.element && !this.isDestroying && !this.isDestroyed) {
-      this._mainLinkElement().classList.remove("focused");
+      this.element.classList.remove("selected");
     }
   },
 
@@ -382,10 +382,6 @@ export default Component.extend({
     return this.site.desktopView && this.focusLastVisitedTopic;
   },
 
-  _mainLinkElement() {
-    return this.element.querySelector(".main-link");
-  },
-
   _titleElement() {
     return this.element.querySelector(".main-link .title");
   },
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 7b9f6ab2d4f..c5aae03f951 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -246,10 +246,8 @@
       pointer-events: none;
     }
 
-    &.focused {
-      box-shadow: inset 3px 0 0 var(--tertiary);
-    }
-    /* we have a custom focus indicator so we can remove the native one */
+    // we have a custom focus indicator via .selected
+    // we can remove the native one
     .title:focus {
       outline: none;
     }