diff --git a/web/pgadmin/static/js/Theme/index.jsx b/web/pgadmin/static/js/Theme/index.jsx
index b9f9b1860..d800bb10f 100644
--- a/web/pgadmin/static/js/Theme/index.jsx
+++ b/web/pgadmin/static/js/Theme/index.jsx
@@ -180,6 +180,9 @@ basicSettings = createMuiTheme(basicSettings, {
       leavingScreen: 95,
     }
   },
+  zIndex: {
+    modal: 2000,
+  },
   props: {
     MuiTextField: {
       variant: 'outlined',
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index 7d9d4289e..8ca96298b 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -261,7 +261,7 @@
 
 .wcMenuList, .context-menu-list {
   border: 1px solid $dropdown-border-color;
-  z-index: 9999 !important;
+  z-index: 1999 !important;
   background-color: $dropdown-bg;
   box-shadow: $dropdown-box-shadow;
   border-radius: $dropdown-border-radius;