diff --git a/web/annotation_editor_layer_builder.css b/web/annotation_editor_layer_builder.css
index e25685e0e..9fea9b19d 100644
--- a/web/annotation_editor_layer_builder.css
+++ b/web/annotation_editor_layer_builder.css
@@ -53,6 +53,7 @@
   font-size: calc(100px * var(--scale-factor));
   transform-origin: 0 0;
   cursor: auto;
+  z-index: 20000;
 }
 
 .annotationEditorLayer.freeTextEditing {
diff --git a/web/viewer.css b/web/viewer.css
index 167f65198..6708f009b 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -449,7 +449,7 @@ body {
 .editorParamsToolbar {
   top: 32px;
   position: absolute;
-  z-index: 10000;
+  z-index: 30000;
   height: auto;
   padding: 0 4px;
   margin: 4px 2px;
@@ -523,7 +523,6 @@ body {
   padding: 6px 0 10px;
   inset-inline-end: 4px;
   height: auto;
-  z-index: 30000;
   background-color: var(--doorhanger-bg-color);
 }