From 346b46c10a21be9fd38fa117a589d7ea0555b743 Mon Sep 17 00:00:00 2001
From: jharris4 <harris.jb@gmail.com>
Date: Tue, 20 Apr 2021 18:52:58 +0100
Subject: [PATCH] ignore enter/escape key from Monaco when find widget visible

---
 src/browser/modules/Editor/Monaco.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/modules/Editor/Monaco.tsx b/src/browser/modules/Editor/Monaco.tsx
index f233f414375..f1cf0d23991 100644
--- a/src/browser/modules/Editor/Monaco.tsx
+++ b/src/browser/modules/Editor/Monaco.tsx
@@ -178,7 +178,7 @@ const Monaco = forwardRef<MonacoHandles, MonacoProps>(
       editorRef.current.addCommand(
         KeyCode.Enter,
         () => (isMultiLine() ? newLine() : execute()),
-        '!suggestWidgetVisible'
+        '!suggestWidgetVisible && !findWidgetVisible'
       )
       editorRef.current.addCommand(
         KeyCode.UpArrow,
@@ -208,7 +208,7 @@ const Monaco = forwardRef<MonacoHandles, MonacoProps>(
       editorRef.current.addCommand(
         KeyCode.Escape,
         toggleFullscreen,
-        '!suggestWidgetVisible'
+        '!suggestWidgetVisible && !findWidgetVisible'
       )
 
       onContentUpdate()