diff --git a/app/MindWork AI Studio/Pages/Chat.razor b/app/MindWork AI Studio/Pages/Chat.razor
index cec5df94..8c345b4a 100644
--- a/app/MindWork AI Studio/Pages/Chat.razor	
+++ b/app/MindWork AI Studio/Pages/Chat.razor	
@@ -20,34 +20,28 @@
     {
         <MudSplitter Dimension="@this.ReadSplitterPosition" DimensionChanged="this.SplitterChanged" EnableSlide="@this.AreWorkspacesVisible" EnableMargin="@false" StartContentStyle="margin-right: 1em;" BarStyle="" EndContentStyle="margin-left: 1em;">
             <StartContent>
-                @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is not WorkspaceStorageBehavior.DISABLE_WORKSPACES)
+                @if (this.SettingsManager.ConfigurationData.Workspace.DisplayBehavior is WorkspaceDisplayBehavior.TOGGLE_SIDEBAR && this.SettingsManager.ConfigurationData.Workspace.IsSidebarVisible)
                 {
-                    @if ((this.SettingsManager.ConfigurationData.Workspace.DisplayBehavior is WorkspaceDisplayBehavior.TOGGLE_SIDEBAR && this.SettingsManager.ConfigurationData.Workspace.IsSidebarVisible) || this.SettingsManager.ConfigurationData.Workspace.DisplayBehavior is WorkspaceDisplayBehavior.SIDEBAR_ALWAYS_VISIBLE)
-                    {
-                        @if (this.SettingsManager.ConfigurationData.Workspace.DisplayBehavior is WorkspaceDisplayBehavior.TOGGLE_SIDEBAR && this.SettingsManager.ConfigurationData.Workspace.IsSidebarVisible)
-                        {
-                            // Case: Sidebar can be toggled and is currently visible
-                            <InnerScrolling FillEntireHorizontalSpace="@true" Class="border border-solid rounded-lg mb-3" MinWidth="26em">
-                                <HeaderContent>
-                                    <MudTooltip Text="Hide your workspaces" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                                        <MudIconButton Size="Size.Large" Icon="@this.WorkspaceSidebarToggleIcon" OnClick="() => this.ToggleWorkspaceSidebar()"/>
-                                    </MudTooltip>
-                                </HeaderContent>
-                                <ChildContent>
-                                    <Workspaces @ref="this.workspaces" @bind-CurrentChatThread="@this.chatThread"/>
-                                </ChildContent>
-                            </InnerScrolling>
-                        }
-                        else
-                        {
-                            // Case: Sidebar is always visible
-                            <InnerScrolling FillEntireHorizontalSpace="@true" Class="border border-solid rounded-lg mb-3" MinWidth="26em">
-                                <ChildContent>
-                                    <Workspaces @ref="this.workspaces" @bind-CurrentChatThread="@this.chatThread"/>
-                                </ChildContent>
-                            </InnerScrolling>
-                        }
-                    }
+                    // Case: Sidebar can be toggled and is currently visible
+                    <InnerScrolling FillEntireHorizontalSpace="@true" Class="border border-solid rounded-lg mb-3" MinWidth="26em">
+                        <HeaderContent>
+                            <MudTooltip Text="Hide your workspaces" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                                <MudIconButton Size="Size.Large" Icon="@this.WorkspaceSidebarToggleIcon" OnClick="() => this.ToggleWorkspaceSidebar()"/>
+                            </MudTooltip>
+                        </HeaderContent>
+                        <ChildContent>
+                            <Workspaces @ref="this.workspaces" @bind-CurrentChatThread="@this.chatThread"/>
+                        </ChildContent>
+                    </InnerScrolling>
+                }
+                else
+                {
+                    // Case: Sidebar is always visible
+                    <InnerScrolling FillEntireHorizontalSpace="@true" Class="border border-solid rounded-lg mb-3" MinWidth="26em">
+                        <ChildContent>
+                            <Workspaces @ref="this.workspaces" @bind-CurrentChatThread="@this.chatThread"/>
+                        </ChildContent>
+                    </InnerScrolling>
                 }
             </StartContent>
             <EndContent>