diff --git a/app/MindWork AI Studio/Components/Workspaces.razor b/app/MindWork AI Studio/Components/Workspaces.razor
index c0185e3e..74e52edd 100644
--- a/app/MindWork AI Studio/Components/Workspaces.razor	
+++ b/app/MindWork AI Studio/Components/Workspaces.razor	
@@ -65,7 +65,7 @@ else
                         <MudTreeViewItem T="ITreeItem" Icon="@this.GetTreeItemIcon(treeItem)" Value="@item.Value" Expanded="@item.Expanded" CanExpand="@treeItem.Expandable" Items="@(treeItem.Children!)" OnClick="@(() => this.LoadChatAsync(treeItem.Path, true))">
                             <BodyContent>
                                 <div style="display: grid; grid-template-columns: 1fr auto; align-items: center; width: 100%">
-                                    <MudText Style="justify-self: start;">
+                                    <MudText Style="@this.GetChatTreeItemTextStyle(treeItem)">
                                         @if (string.IsNullOrWhiteSpace(treeItem.Text))
                                         {
                                             @T("Empty chat")
diff --git a/app/MindWork AI Studio/Components/Workspaces.razor.cs b/app/MindWork AI Studio/Components/Workspaces.razor.cs
index 46f44a96..0848fa34 100644
--- a/app/MindWork AI Studio/Components/Workspaces.razor.cs	
+++ b/app/MindWork AI Studio/Components/Workspaces.razor.cs	
@@ -379,6 +379,19 @@ public partial class Workspaces : MSGComponentBase
         return treeItem.Type is TreeItemType.CHAT && this.AIJobService.IsChatGenerationActive(treeItem.ChatId);
     }
 
+    private string GetChatTreeItemTextStyle(TreeItemData treeItem)
+    {
+        return this.IsCurrentChatTreeItem(treeItem) ? "justify-self: start; font-weight: 700;" : "justify-self: start;";
+    }
+
+    private bool IsCurrentChatTreeItem(TreeItemData treeItem)
+    {
+        return treeItem.Type is TreeItemType.CHAT
+               && this.CurrentChatThread is not null
+               && treeItem.ChatId == this.CurrentChatThread.ChatId
+               && treeItem.WorkspaceId == this.CurrentChatThread.WorkspaceId;
+    }
+
     private string GetChatTreeIcon(Guid chatId, string defaultIcon)
     {
         var snapshot = this.AIJobService.TryGetChatSnapshot(chatId);
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v26.6.1.md b/app/MindWork AI Studio/wwwroot/changelog/v26.6.1.md
index d4642138..da00a2bb 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v26.6.1.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v26.6.1.md	
@@ -5,6 +5,7 @@
 - Added support for reading enterprise policy files from a Flatpak provisioning extension.
 - Added startup path and Linux package type details to the information page to make support easier.
 - Added the option to search for chats in all workspaces.
+- Improved workspaces by highlighting the currently open chat in the workspace view.
 - Improved workspaces by adding a shortcut to start a new chat directly from each workspace row.
 - Improved workspaces by allowing new workspaces to be created while moving a chat.
 - Improved the enterprise configuration details on the information page by showing where each configuration comes from and which configuration slot was used.