diff --git a/app/MindWork AI Studio/Layout/MainLayout.razor b/app/MindWork AI Studio/Layout/MainLayout.razor
index 167a159..80eb62e 100644
--- a/app/MindWork AI Studio/Layout/MainLayout.razor	
+++ b/app/MindWork AI Studio/Layout/MainLayout.razor	
@@ -8,25 +8,39 @@
     <MudLayout>
         @if (!this.performingUpdate)
         {
-            <MudDrawerContainer Class="mud-height-full absolute">
-                <MudDrawer @bind-Open="@this.navBarOpen" MiniWidth="@NAVBAR_COLLAPSED_WIDTH" Width="@NAVBAR_EXPANDED_WIDTH" Elevation="1" Fixed="@true" Variant="@DrawerVariant.Mini" OpenMiniOnHover="@(this.SettingsManager.ConfigurationData.App.NavigationBehavior is NavBehavior.EXPAND_ON_HOVER)" Color="Color.Default">
+            @if (this.SettingsManager.ConfigurationData.App.NavigationBehavior is NavBehavior.EXPAND_ON_HOVER or NavBehavior.ALWAYS_EXPAND)
+            {
+                <MudDrawerContainer Class="mud-height-full absolute">
+                    <MudDrawer @bind-Open="@this.navBarOpen" MiniWidth="@NAVBAR_COLLAPSED_WIDTH" Width="@NAVBAR_EXPANDED_WIDTH" Elevation="1" Fixed="@true" Variant="@DrawerVariant.Mini" OpenMiniOnHover="@(this.SettingsManager.ConfigurationData.App.NavigationBehavior is NavBehavior.EXPAND_ON_HOVER)" Color="Color.Default">
+                        <MudNavMenu>
+                            @foreach (var navBarItem in this.navItems)
+                            {
+                                <MudNavLink Href="@navBarItem.Path" Match="@(navBarItem.MatchAll ? NavLinkMatch.All : NavLinkMatch.Prefix)" Icon="@navBarItem.Icon" Style="@navBarItem.SetColorStyle(this.SettingsManager)" Class="custom-icon-color">@navBarItem.Name</MudNavLink>
+                            }
+                        </MudNavMenu>
+                    </MudDrawer>
+                </MudDrawerContainer>
+            }
+            else
+            {
+                <MudPaper Width="4em" Class="mud-height-full absolute">
                     <MudNavMenu>
                         @foreach (var navBarItem in this.navItems)
                         {
                             if (this.SettingsManager.ConfigurationData.App.NavigationBehavior is NavBehavior.NEVER_EXPAND_USE_TOOLTIPS)
                             {
                                 <MudTooltip Text="@navBarItem.Name" Placement="Placement.Right">
-                                    <MudNavLink Href="@navBarItem.Path" Match="@(navBarItem.MatchAll ? NavLinkMatch.All : NavLinkMatch.Prefix)" Icon="@navBarItem.Icon" Style="@navBarItem.SetColorStyle(this.SettingsManager)" Class="custom-icon-color">@navBarItem.Name</MudNavLink>
+                                    <MudNavLink Href="@navBarItem.Path" Match="@(navBarItem.MatchAll ? NavLinkMatch.All : NavLinkMatch.Prefix)" Icon="@navBarItem.Icon" Style="@navBarItem.SetColorStyle(this.SettingsManager)" Class="custom-icon-color"/>
                                 </MudTooltip>
                             }
                             else
                             {
-                                <MudNavLink Href="@navBarItem.Path" Match="@(navBarItem.MatchAll ? NavLinkMatch.All : NavLinkMatch.Prefix)" Icon="@navBarItem.Icon" Style="@navBarItem.SetColorStyle(this.SettingsManager)" Class="custom-icon-color">@navBarItem.Name</MudNavLink>
+                                <MudNavLink Href="@navBarItem.Path" Match="@(navBarItem.MatchAll ? NavLinkMatch.All : NavLinkMatch.Prefix)" Icon="@navBarItem.Icon" Style="@navBarItem.SetColorStyle(this.SettingsManager)" Class="custom-icon-color"/>
                             }
                         }
                     </MudNavMenu>
-                </MudDrawer>
-            </MudDrawerContainer>
+                </MudPaper>
+            }
         }
 
         <MudMainContent Class="mud-height-full pt-1" Style="@this.PaddingLeft">
diff --git a/app/MindWork AI Studio/wwwroot/app.css b/app/MindWork AI Studio/wwwroot/app.css
index d19da8e..6257c7c 100644
--- a/app/MindWork AI Studio/wwwroot/app.css	
+++ b/app/MindWork AI Studio/wwwroot/app.css	
@@ -69,4 +69,9 @@
     text-decoration-style: double;
     text-decoration-color: red;
     text-decoration-thickness: 2px;
-}
\ No newline at end of file
+}
+
+/* Fixed for MudBlazor, tooltips inside of navmenu */
+.mud-navmenu .mud-tooltip-root {
+    display: initial !important;
+}
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md
index 8273559..52bea25 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md	
@@ -6,7 +6,8 @@
 - Improved provider requests by handling rate limits by retrying requests. 
 - Improved the creation of the "the bias of the day" workspace; create that workspace only when the bias of the day feature is used.
 - Improved the save operation of settings by using a temporary file to avoid data loss in rare cases.
-- Improved the system prompt handling: Injection of profiles into system prompts happens right before sending the data. This way, the original system prompts are not modified. 
+- Improved the system prompt handling: Injection of profiles into system prompts happens right before sending the data. This way, the original system prompts are not modified.
+- Improved the navigation bar handling when configured as "never expands" with or without tooltips.
 - Fixed OpenAI `o` (aka omni, aka reasoning) models. The early preview versions (released before 17th December 2024) could not use any system prompts —- we translated the system prompts to be user prompts. Final versions of the OpenAI `o` models can now use system prompts, by they are named `developer` instead of `system`.
 - Fixed layout issues when selecting `other` items (e.g., programming languages).
 - Fixed a bug about the bias of the day workspace when the workspace component was hidden.