diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
index c363c95fe96..bb5bdced654 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.hbs
@@ -1,21 +1,11 @@
-{{#if (and this.chatStateManager.isFullPageActive this.site.desktopView)}}
-  <span class={{concat-class "icon" (if this.isActive "active")}}>
-    {{d-icon "comment"}}
+<a
+  href={{this.href}}
+  tabindex="0"
+  class={{concat-class "icon" (if this.isActive "active")}}
+>
+  {{d-icon "comment"}}
 
-    {{#unless this.currentUserInDnD}}
-      <ChatHeaderIconUnreadIndicator />
-    {{/unless}}
-  </span>
-{{else}}
-  <a
-    href={{this.href}}
-    tabindex="0"
-    class={{concat-class "icon" (if this.isActive "active")}}
-  >
-    {{d-icon "comment"}}
-
-    {{#unless this.currentUserInDnD}}
-      <ChatHeaderIconUnreadIndicator />
-    {{/unless}}
-  </a>
-{{/if}}
\ No newline at end of file
+  {{#unless this.currentUserInDnD}}
+    <ChatHeaderIconUnreadIndicator />
+  {{/unless}}
+</a>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js
index 9753f8ab005..c69b44ca868 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-header-icon.js
@@ -1,25 +1,31 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
+import getURL from "discourse-common/lib/get-url";
 
 export default class ChatHeaderIcon extends Component {
   @service currentUser;
   @service site;
   @service chatStateManager;
+  @service router;
 
   get currentUserInDnD() {
     return this.currentUser.isInDoNotDisturb();
   }
 
   get href() {
-    if (this.chatStateManager.isFullPageActive && this.site.mobileView) {
-      return "/chat";
+    if (this.chatStateManager.isFullPageActive) {
+      if (this.site.mobileView) {
+        return getURL("/chat");
+      } else {
+        return getURL(this.router.currentURL);
+      }
     }
 
     if (this.chatStateManager.isDrawerActive) {
-      return "/chat";
-    } else {
-      return this.chatStateManager.lastKnownChatURL || "/chat";
+      return getURL("/chat");
     }
+
+    return getURL(this.chatStateManager.lastKnownChatURL || "/chat");
   }
 
   get isActive() {