diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index f6d32eff..a3791923 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -347,7 +347,7 @@ jobs:
           cargo tauri build --target ${{ matrix.rust_target }} --bundles ${{ matrix.tauri_bundle }}
 
       - name: Upload artifact (macOS)
-        if: startsWith(matrix.platform, 'macos') && startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(matrix.platform, 'macos')
         uses: actions/upload-artifact@v4
         with:
           name: MindWork AI Studio (macOS ${{ matrix.dotnet_runtime }})
diff --git a/app/MindWork AI Studio/MindWork AI Studio.csproj b/app/MindWork AI Studio/MindWork AI Studio.csproj
index 0c0edf80..bdfe8287 100644
--- a/app/MindWork AI Studio/MindWork AI Studio.csproj	
+++ b/app/MindWork AI Studio/MindWork AI Studio.csproj	
@@ -49,7 +49,7 @@
       <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.0.0" />
       <PackageReference Include="HtmlAgilityPack" Version="1.12.0" />
       <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.3" />
-      <PackageReference Include="MudBlazor" Version="8.3.0" />
+      <PackageReference Include="MudBlazor" Version="8.4.0" />
       <PackageReference Include="MudBlazor.Markdown" Version="8.0.0" />
       <PackageReference Include="ReverseMarkdown" Version="4.6.0" />
     </ItemGroup>
diff --git a/app/MindWork AI Studio/packages.lock.json b/app/MindWork AI Studio/packages.lock.json
index d9f4caab..37a21d8a 100644
--- a/app/MindWork AI Studio/packages.lock.json	
+++ b/app/MindWork AI Studio/packages.lock.json	
@@ -39,9 +39,9 @@
       },
       "MudBlazor": {
         "type": "Direct",
-        "requested": "[8.3.0, )",
-        "resolved": "8.3.0",
-        "contentHash": "DLc1aK8AgSas82AERWLLefWKadIF7HhYhvgO8Y7jYLZe5v1r4v3rX9pzrzTsQkuPGe6y65tob73kM6gael+WdQ==",
+        "requested": "[8.4.0, )",
+        "resolved": "8.4.0",
+        "contentHash": "JdpJXe13fhPElc4ajoDEr7tbzib+N1SVUaov21lZAVd0DgRWuVTJsfVyrEFCD/oSopRcvub5cpHSJM7MYUVCfQ==",
         "dependencies": {
           "Microsoft.AspNetCore.Components": "9.0.1",
           "Microsoft.AspNetCore.Components.Web": "9.0.1",
diff --git a/app/MindWork AI Studio/wwwroot/app.css b/app/MindWork AI Studio/wwwroot/app.css
index aa733a68..e62b4f83 100644
--- a/app/MindWork AI Studio/wwwroot/app.css	
+++ b/app/MindWork AI Studio/wwwroot/app.css	
@@ -76,14 +76,6 @@
     display: initial !important;
 }
 
-/* Fix for MudBlazor, tooltips and selects inside of popover
-   See issue https://github.com/MudBlazor/MudBlazor/issues/11015
-   and https://github.com/MindWorkAI/AI-Studio/issues/346
- */
-.mud-popover-provider > .mud-popover-open {
-    z-index: 1604 !important;
-}
-
 /* Context div for inner scrolling component */
 .inner-scrolling-context {
     display: flex;
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.38.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.38.md
index 64463499..c26ef9bd 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.38.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.38.md	
@@ -1,3 +1,4 @@
 # v0.9.38, build 213 (2025-03-17 17:07 UTC)
 - Added the "stop generation" button to all assistants.
+- Upgraded MudBlazor to v8.4.0, which fixes some bugs we were experiencing.
 - Updated the ERI v1 specification for the ERI server assistant & fixed spelling of the `UNKNOWN` role.
\ No newline at end of file