diff --git a/app/editor/components/FindAndReplace.tsx b/app/editor/components/FindAndReplace.tsx
index a5232271b..f2b8032f9 100644
--- a/app/editor/components/FindAndReplace.tsx
+++ b/app/editor/components/FindAndReplace.tsx
@@ -29,6 +29,7 @@ type Props = {
 
 export default function FindAndReplace({ readOnly }: Props) {
   const editor = useEditor();
+  const finalFocusRef = React.useRef<HTMLElement>(editor.view.dom);
   const selectionRef = React.useRef<string | undefined>();
   const inputRef = React.useRef<HTMLInputElement>(null);
   const { t } = useTranslation();
@@ -224,6 +225,7 @@ export default function FindAndReplace({ readOnly }: Props) {
     <Portal>
       <Popover
         {...popover}
+        unstable_finalFocusRef={finalFocusRef}
         style={style}
         aria-label={t("Find and replace")}
         width={420}
diff --git a/shared/editor/extensions/FindAndReplace.ts b/shared/editor/extensions/FindAndReplace.ts
index 60c97d86e..df0e7cedc 100644
--- a/shared/editor/extensions/FindAndReplace.ts
+++ b/shared/editor/extensions/FindAndReplace.ts
@@ -141,7 +141,14 @@ export default class FindAndReplace extends Extension {
   }
 
   private get findRegExp() {
-    return RegExp(this.searchTerm, !this.options.caseSensitive ? "gui" : "gu");
+    try {
+      return RegExp(
+        this.searchTerm.replace(/\\+$/, ""),
+        !this.options.caseSensitive ? "gui" : "gu"
+      );
+    } catch (err) {
+      return RegExp("");
+    }
   }
 
   private goToMatch(direction: number): Command {