diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14387c31..4208a37a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixed
 - Fixed terminal layout issues when resizing window vertically.
+- Fixed editor find widget visible over modal dialogs.
 
 ## [2.1.0-beta.3] - 2022-12-28
 
diff --git a/src/editor/editor.scss b/src/editor/editor.scss
index 6bed9d8d..6674f338 100644
--- a/src/editor/editor.scss
+++ b/src/editor/editor.scss
@@ -102,8 +102,20 @@
     }
 }
 
-// override iOS keyboard button position
-.monaco-editor .iPadShowKeyboard {
-    right: unset !important;
-    left: 20px;
+.monaco-editor {
+    // override iOS keyboard button position
+    & .iPadShowKeyboard {
+        right: unset !important;
+        left: 20px;
+    }
+
+    // fix find widget in front of dialogs
+    & .overflow-guard {
+        z-index: bp.$pt-z-index-content - 1;
+    }
+
+    // allow overflow to overlay content outside of editor
+    & .overflowingContentWidget {
+        z-index: bp.$pt-z-index-overlay - 1;
+    }
 }