diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index fcb1815ca4..2d5a6e987f 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -657,7 +657,8 @@ hr {
     font-family: FiraSans-SemiBold;
     font-size: 15px;
     color: #404040;
-    background-color: #afafaf
+    background-color: #afafaf;
+    z-index: 999;
 }
 .dropdown li:hover {
     background-color: #00b4ef;
diff --git a/scripts/system/html/css/jsoneditor.css b/scripts/system/html/css/jsoneditor.css
index 4d63380a62..ce83b45ff3 100644
--- a/scripts/system/html/css/jsoneditor.css
+++ b/scripts/system/html/css/jsoneditor.css
@@ -503,7 +503,7 @@ div.jsoneditor-contextmenu-root {
 div.jsoneditor-contextmenu {
   position: absolute;
   box-sizing: content-box;
-  z-index: 99999;
+  z-index: 998;
 }
 
 div.jsoneditor-contextmenu ul,