diff --git a/app/MindWork AI Studio/wwwroot/app.css b/app/MindWork AI Studio/wwwroot/app.css
index e62b4f83..60ec2d98 100644
--- a/app/MindWork AI Studio/wwwroot/app.css	
+++ b/app/MindWork AI Studio/wwwroot/app.css	
@@ -76,6 +76,14 @@
     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;
+}
+
 /* Context div for inner scrolling component */
 .inner-scrolling-context {
     display: flex;
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.36.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.36.md
new file mode 100644
index 00000000..ab05d827
--- /dev/null
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.36.md	
@@ -0,0 +1,2 @@
+# v0.9.36, build 211 (2025-03-15 xx:xx UTC)
+- Fixed a MudBlazor bug, where dropdown menus were not displayed correctly when used inside a dialog.
\ No newline at end of file