diff --git a/public/css/index-tailwind-output.css b/public/css/index-tailwind-output.css
index 4e5afe54b..790502ded 100644
--- a/public/css/index-tailwind-output.css
+++ b/public/css/index-tailwind-output.css
@@ -1462,6 +1462,10 @@ input[type="range"].range-lg::-moz-range-thumb {
   margin-right: 4rem;
 }
 
+.mb-4 {
+  margin-bottom: 1rem;
+}
+
 .mt-4 {
   margin-top: 1rem;
 }
@@ -1478,10 +1482,6 @@ input[type="range"].range-lg::-moz-range-thumb {
   margin-bottom: 4rem;
 }
 
-.mb-4 {
-  margin-bottom: 1rem;
-}
-
 .ml-1 {
   margin-left: 0.25rem;
 }
@@ -1698,14 +1698,14 @@ input[type="range"].range-lg::-moz-range-thumb {
   height: 6rem;
 }
 
-.h-full {
-  height: 100%;
-}
-
 .h-screen {
   height: 100vh;
 }
 
+.h-full {
+  height: 100%;
+}
+
 .h-fit {
   height: -webkit-fit-content;
   height: -moz-fit-content;
@@ -4016,6 +4016,10 @@ input[type="range"].range-lg::-moz-range-thumb {
   padding-right: 0.25rem;
 }
 
+.pb-4 {
+  padding-bottom: 1rem;
+}
+
 .pt-0\.5 {
   padding-top: 0.125rem;
 }
@@ -5628,6 +5632,18 @@ svg.apply-fill path {
   max-width: 100vw;
 }
 
+.z-4 {
+  z-index: 4;
+}
+
+.z-3 {
+  z-index: 3;
+}
+
+.z-5 {
+  z-index: 5;
+}
+
 /************************* Experimental support for foldable devices ********************************/
 
 @media (horizontal-viewport-segments: 2) {
diff --git a/src/UI/Base/DrawerRight.svelte b/src/UI/Base/DrawerRight.svelte
index 06120768e..6fd67c962 100644
--- a/src/UI/Base/DrawerRight.svelte
+++ b/src/UI/Base/DrawerRight.svelte
@@ -26,7 +26,7 @@
 <Drawer placement="right"
         transitionType="fly" {transitionParams}
         activateClickOutside={false}
-        divClass="overflow-y-auto"
+        divClass="overflow-y-auto z-3"
         backdrop={false}
         id="drawer-right"
         width="w-full sm:w-80 md:w-96"
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 034316fb5..52ac9dd8e 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -327,7 +327,7 @@
 
 
   <!-- Top components -->
-  <div class="pointer-events-none absolute top-0 left-0 w-full">
+  <div class="pointer-events-none absolute top-0 left-0 w-full z-4">
 
     <div
       id="top-bar"
diff --git a/src/index.css b/src/index.css
index 057ab84da..e32bb619d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -671,6 +671,17 @@ svg.apply-fill path {
     max-width: 100vw;
 }
 
+.z-4 {
+    z-index: 4;
+}
+
+.z-3 {
+    z-index: 3;
+}
+
+.z-5 {
+    z-index: 5;
+}
 /************************* Experimental support for foldable devices ********************************/
 @media (horizontal-viewport-segments: 2) {
     .theme-list {