diff --git a/plugins/chunter-resources/src/components/chat/Chat.svelte b/plugins/chunter-resources/src/components/chat/Chat.svelte
index b0e16f10c6..0254c14f00 100644
--- a/plugins/chunter-resources/src/components/chat/Chat.svelte
+++ b/plugins/chunter-resources/src/components/chat/Chat.svelte
@@ -127,7 +127,7 @@
     const thread = loc.path[4] as Ref<ActivityMessage> | undefined
 
     if (thread !== undefined) {
-      void openThreadInSidebar(thread)
+      void openThreadInSidebar(thread, undefined, undefined, undefined, undefined, false)
     }
   }
 
diff --git a/plugins/chunter-resources/src/navigation.ts b/plugins/chunter-resources/src/navigation.ts
index 1e2d760414..8b359f4e89 100644
--- a/plugins/chunter-resources/src/navigation.ts
+++ b/plugins/chunter-resources/src/navigation.ts
@@ -339,8 +339,23 @@ export async function openThreadInSidebar (
   msg?: ActivityMessage,
   doc?: Doc,
   selectedMessageId?: Ref<ActivityMessage>,
-  props?: Record<string, any>
+  props?: Record<string, any>,
+  force: boolean = true
 ): Promise<void> {
+  const sidebar = get(sidebarStore)
+  if (!force && sidebar.widget != null && sidebar.widget !== chunter.ids.ChatWidget) {
+    removeThreadFromLoc(_id)
+    return
+  }
+  const state = sidebar.widget === chunter.ids.ChatWidget ? sidebar.widgetsState.get(chunter.ids.ChatWidget) : undefined
+  const currentTabs = sidebar.widgetsState.get(chunter.ids.ChatWidget)?.tabs ?? []
+  const currentTab = state != null ? currentTabs.find((t) => t.id === state.tab) : undefined
+
+  if (!force && currentTab != null && (currentTab.isPinned === true || !currentTab.id.startsWith('thread_'))) {
+    removeThreadFromLoc(_id)
+    return
+  }
+
   const client = getClient()
 
   const widget = client.getModel().findAllSync(workbench.class.Widget, { _id: chunter.ids.ChatWidget })[0]
@@ -362,7 +377,7 @@ export async function openThreadInSidebar (
   }
 
   const allowedPath = loc.path.join('/')
-  const currentTabs = get(sidebarStore).widgetsState.get(widget._id)?.tabs ?? []
+
   const tabsToClose = currentTabs.filter((t) => t.isPinned !== true && t.allowedPath === allowedPath).map((t) => t.id)
 
   if (tabsToClose.length > 0) {
diff --git a/plugins/chunter/src/index.ts b/plugins/chunter/src/index.ts
index 45e555ed65..3a7e15f0a8 100644
--- a/plugins/chunter/src/index.ts
+++ b/plugins/chunter/src/index.ts
@@ -235,7 +235,8 @@ export default plugin(chunterId, {
       msg?: ActivityMessage,
       doc?: Doc,
       selectedId?: Ref<ActivityMessage>,
-      props?: Record<string, any>
+      props?: Record<string, any>,
+      force?: boolean
     ) => Promise<void>
     >,
     OpenChannelInSidebar: '' as Resource<
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
index 00ef42d6f9..5be7cc622b 100644
--- a/plugins/notification-resources/src/components/inbox/Inbox.svelte
+++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -192,7 +192,7 @@
 
     if (thread !== undefined) {
       const fn = await getResource(chunter.function.OpenThreadInSidebar)
-      void fn(thread, undefined, undefined, selectedMessageId, { autofocus: false })
+      void fn(thread, undefined, undefined, selectedMessageId, { autofocus: false }, false)
     }
 
     if (selectedMessageId !== undefined) {
diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts
index 9d56b36b1a..a843864718 100644
--- a/plugins/notification-resources/src/utils.ts
+++ b/plugins/notification-resources/src/utils.ts
@@ -50,7 +50,7 @@ import notification, {
   type NotificationProviderSetting,
   type NotificationTypeSetting
 } from '@hcengineering/notification'
-import { getMetadata } from '@hcengineering/platform'
+import { getMetadata, getResource } from '@hcengineering/platform'
 import { MessageBox, createQuery, getClient } from '@hcengineering/presentation'
 import {
   getCurrentLocation,
@@ -552,6 +552,8 @@ async function navigateToInboxDoc (
   if (thread !== undefined) {
     loc.path[4] = thread
     loc.path.length = 5
+    const fn = await getResource(chunter.function.OpenThreadInSidebar)
+    void fn(thread, undefined, undefined, message, { autofocus: false })
   } else {
     loc.path[4] = ''
     loc.path.length = 4