diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
index b06fa4e6913..596b828c87b 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
@@ -131,7 +131,6 @@ export default class ChatChannelsManager extends Service {
       .sort((a, b) => a?.slug?.localeCompare?.(b?.slug));
   }
 
-  @cached
   get publicMessageChannelsWithActivity() {
     return this.publicMessageChannels.filter((channel) => channel.hasUnread);
   }
@@ -150,7 +149,6 @@ export default class ChatChannelsManager extends Service {
     );
   }
 
-  @cached
   get directMessageChannelsWithActivity() {
     return this.directMessageChannels.filter((channel) => channel.hasUnread);
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat.js b/plugins/chat/assets/javascripts/discourse/services/chat.js
index d5c39bad8f5..da8ea4f4a97 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat.js
@@ -313,9 +313,21 @@ export default class Chat extends Service {
 
         // Insert the active channel after unread channel we found (or at the start of the list)
         if (activeChannel.isDirectMessageChannel) {
-          directChannels.splice(checkChannelIndex + 1, 0, activeChannel);
+          const unreadChannelIndex =
+            checkChannelIndex < 0
+              ? 0
+              : directChannels.findIndex(
+                  (c) => c.id === allChannels[checkChannelIndex].id
+                );
+          directChannels.splice(unreadChannelIndex + 1, 0, activeChannel);
         } else {
-          publicChannels.splice(checkChannelIndex + 1, 0, activeChannel);
+          const unreadChannelIndex =
+            checkChannelIndex < 0
+              ? -1
+              : publicChannels.findIndex(
+                  (c) => c.id === allChannels[checkChannelIndex].id
+                );
+          publicChannels.splice(unreadChannelIndex + 1, 0, activeChannel);
         }
       }
     } else {
diff --git a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
index 48956303dd0..81ce2f1f728 100644
--- a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
@@ -52,6 +52,7 @@ RSpec.describe "Shortcuts | sidebar", type: :system do
     fab!(:channel_1) { Fabricate(:chat_channel, name: "Channel 1") }
     fab!(:channel_2) { Fabricate(:chat_channel, name: "Channel 2") }
     fab!(:channel_3) { Fabricate(:chat_channel, name: "Channel 3") }
+    fab!(:channel_4) { Fabricate(:chat_channel, name: "Channel 4") }
     fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
     fab!(:other_user) { Fabricate(:user) }
     fab!(:dm_channel_2) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
@@ -60,6 +61,7 @@ RSpec.describe "Shortcuts | sidebar", type: :system do
       channel_1.add(current_user)
       channel_2.add(current_user)
       channel_3.add(current_user)
+      channel_4.add(current_user)
     end
 
     context "when on homepage" do
@@ -140,19 +142,61 @@ RSpec.describe "Shortcuts | sidebar", type: :system do
       end
 
       it "remembers where the current channel is, even if that channel is unread" do
+        chat.visit_channel(channel_3)
+        expect(sidebar_page).to have_active_channel(channel_3)
+
+        Fabricate(:chat_message, chat_channel: channel_2, message: "hello!", use_service: true)
+        expect(sidebar_page).to have_unread_channel(channel_2)
+
+        Fabricate(:chat_message, chat_channel: channel_4, message: "yes, hello!", use_service: true)
+        expect(sidebar_page).to have_unread_channel(channel_4)
+
+        find("body").send_keys(%i[alt shift arrow_down])
+
+        expect(sidebar_page).to have_active_channel(channel_4)
+        expect(sidebar_page).to have_no_unread_channel(channel_4)
+
+        Fabricate(
+          :chat_message,
+          chat_channel: channel_3,
+          message: "hello, here, too!",
+          use_service: true,
+        )
+        expect(sidebar_page).to have_unread_channel(channel_3)
+
+        find("body").send_keys(%i[alt shift arrow_up])
+
+        expect(sidebar_page).to have_active_channel(channel_3)
+        expect(sidebar_page).to have_no_unread_channel(channel_3)
+
+        Fabricate(
+          :chat_message,
+          chat_channel: channel_4,
+          message: "okay, byebye!",
+          use_service: true,
+        )
+        expect(sidebar_page).to have_unread_channel(channel_4)
+
+        find("body").send_keys(%i[alt shift arrow_up])
+
+        expect(sidebar_page).to have_active_channel(channel_2)
+        expect(sidebar_page).to have_no_unread_channel(channel_2)
+      end
+
+      it "handles the shortcut being pressed quickly" do
         chat.visit_channel(channel_2)
         expect(sidebar_page).to have_active_channel(channel_2)
 
         Fabricate(:chat_message, chat_channel: channel_1, message: "hello!", use_service: true)
         expect(sidebar_page).to have_unread_channel(channel_1)
 
-        Fabricate(:chat_message, chat_channel: channel_3, message: "hello!", use_service: true)
-        expect(sidebar_page).to have_unread_channel(channel_3)
+        Fabricate(:chat_message, chat_channel: channel_4, message: "howdy!", use_service: true)
+        expect(sidebar_page).to have_unread_channel(channel_4)
 
+        find("body").send_keys(%i[alt shift arrow_up])
         find("body").send_keys(%i[alt shift arrow_down])
 
-        expect(sidebar_page).to have_active_channel(channel_3)
-        expect(sidebar_page).to have_no_unread_channel(channel_3)
+        expect(sidebar_page).to have_active_channel(channel_4)
       end
     end
   end