diff --git a/apps/client/src/widgets/dialogs/branch_prefix.ts b/apps/client/src/widgets/dialogs/branch_prefix.ts
deleted file mode 100644
index 496700a0c..000000000
--- a/apps/client/src/widgets/dialogs/branch_prefix.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import treeService from "../../services/tree.js";
-import server from "../../services/server.js";
-import froca from "../../services/froca.js";
-import toastService from "../../services/toast.js";
-import BasicWidget from "../basic_widget.js";
-import appContext from "../../components/app_context.js";
-import { t } from "../../services/i18n.js";
-import { Modal } from "bootstrap";
-import { openDialog } from "../../services/dialog.js";
-
-const TPL = /*html*/`<div class="branch-prefix-dialog modal fade mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-lg" role="document">
-        <form class="branch-prefix-form">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title flex-grow-1">${t("branch_prefix.edit_branch_prefix")}</h5>
-                    <button class="help-button" type="button" data-help-page="tree-concepts.html#prefix" title="${t("branch_prefix.help_on_tree_prefix")}">?</button>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${t("branch_prefix.close")}"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="branch-prefix-input">${t("branch_prefix.prefix")}</label> &nbsp;
-
-                        <div class="input-group">
-                            <input class="branch-prefix-input form-control">
-                            <div class="branch-prefix-note-title input-group-text"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button class="btn btn-primary btn-sm">${t("branch_prefix.save")}</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>`;
-
-export default class BranchPrefixDialog extends BasicWidget {
-    private modal!: Modal;
-    private $form!: JQuery<HTMLElement>;
-    private $treePrefixInput!: JQuery<HTMLElement>;
-    private $noteTitle!: JQuery<HTMLElement>;
-    private branchId: string | null = null;
-
-    doRender() {
-        this.$widget = $(TPL);
-        this.modal = Modal.getOrCreateInstance(this.$widget[0]);
-        this.$form = this.$widget.find(".branch-prefix-form");
-        this.$treePrefixInput = this.$widget.find(".branch-prefix-input");
-        this.$noteTitle = this.$widget.find(".branch-prefix-note-title");
-
-        this.$form.on("submit", () => {
-            this.savePrefix();
-            return false;
-        });
-
-        this.$widget.on("shown.bs.modal", () => this.$treePrefixInput.trigger("focus"));
-    }
-
-    async refresh(notePath: string) {
-        const { noteId, parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(notePath);
-
-        if (!noteId || !parentNoteId) {
-            return;
-        }
-
-        const newBranchId = await froca.getBranchId(parentNoteId, noteId);
-        if (!newBranchId) {
-            return;
-        }
-        this.branchId = newBranchId;
-
-        const branch = froca.getBranch(this.branchId);
-        if (!branch || branch.noteId === "root") {
-            return;
-        }
-
-        const parentNote = await froca.getNote(branch.parentNoteId);
-        if (!parentNote || parentNote.type === "search") {
-            return;
-        }
-
-        this.$treePrefixInput.val(branch.prefix || "");
-
-        const noteTitle = await treeService.getNoteTitle(noteId);
-        this.$noteTitle.text(` - ${noteTitle}`);
-    }
-
-    async editBranchPrefixEvent() {
-        const notePath = appContext.tabManager.getActiveContextNotePath();
-        if (!notePath) {
-            return;
-        }
-
-        await this.refresh(notePath);
-        openDialog(this.$widget);
-    }
-
-    async savePrefix() {
-        const prefix = this.$treePrefixInput.val();
-
-        await server.put(`branches/${this.branchId}/set-prefix`, { prefix: prefix });
-
-        this.modal.hide();
-
-        toastService.showMessage(t("branch_prefix.branch_prefix_saved"));
-    }
-}
diff --git a/apps/client/src/widgets/dialogs/branch_prefix.tsx b/apps/client/src/widgets/dialogs/branch_prefix.tsx
new file mode 100644
index 000000000..5aba41c49
--- /dev/null
+++ b/apps/client/src/widgets/dialogs/branch_prefix.tsx
@@ -0,0 +1,92 @@
+import { useRef, useState } from "preact/hooks";
+import appContext from "../../components/app_context.js";
+import { closeActiveDialog, openDialog } from "../../services/dialog.js";
+import { t } from "../../services/i18n.js";
+import server from "../../services/server.js";
+import toast from "../../services/toast.js";
+import Modal from "../react/Modal.jsx";
+import ReactBasicWidget from "../react/ReactBasicWidget.js";
+import froca from "../../services/froca.js";
+import tree from "../../services/tree.js";
+import FBranch from "../../entities/fbranch.js";
+
+interface BranchPrefixDialogProps {
+    branch?: FBranch;
+}
+
+function BranchPrefixDialogComponent({ branch }: BranchPrefixDialogProps) {
+    const [ prefix, setPrefix ] = useState(branch?.prefix ?? "");
+    const branchInput = useRef<HTMLInputElement>(null);
+
+    async function onSubmit() {
+        if (!branch) {
+            return;
+        }
+
+        savePrefix(branch.branchId, prefix);
+        closeActiveDialog();
+    }
+
+    return (
+        <Modal
+            className="branch-prefix-dialog"
+            title={t("branch_prefix.edit_branch_prefix")}
+            size="lg"
+            onShown={() => branchInput.current?.focus()}
+            onSubmit={onSubmit}
+            footer={<button class="btn btn-primary btn-sm">{t("branch_prefix.save")}</button>}
+        >
+            <div class="form-group">
+                <label for="branch-prefix-input">{t("branch_prefix.prefix")}</label> &nbsp;
+
+                <div class="input-group">
+                    <input class="branch-prefix-input form-control" value={prefix} ref={branchInput}
+                        onChange={(e) => setPrefix((e.target as HTMLInputElement).value)} />
+                    <div class="branch-prefix-note-title input-group-text"> - {branch && branch.getNoteFromCache().title}</div>
+                </div>
+            </div>
+        </Modal>
+    );
+}
+
+export default class BranchPrefixDialog extends ReactBasicWidget {
+    private branch?: FBranch;
+
+    get component() {
+        return <BranchPrefixDialogComponent branch={this.branch} />;
+    }
+
+    async editBranchPrefixEvent() {
+        const notePath = appContext.tabManager.getActiveContextNotePath();
+        if (!notePath) {
+            return;
+        }
+
+        const { noteId, parentNoteId } = tree.getNoteIdAndParentIdFromUrl(notePath);
+
+        if (!noteId || !parentNoteId) {
+            return;
+        }
+
+        const newBranchId = await froca.getBranchId(parentNoteId, noteId);
+        if (!newBranchId) {
+            return;
+        }    
+        const parentNote = await froca.getNote(parentNoteId);
+        if (!parentNote || parentNote.type === "search") {
+            return;
+        }
+
+        this.branch = froca.getBranch(newBranchId);
+
+        // Re-render the component with the new notePath
+        this.doRender();
+        openDialog(this.$widget);
+    }
+
+}
+
+async function savePrefix(branchId: string, prefix: string) {
+    await server.put(`branches/${branchId}/set-prefix`, { prefix: prefix });
+    toast.showMessage(t("branch_prefix.branch_prefix_saved"));
+}
\ No newline at end of file
diff --git a/apps/client/src/widgets/react/Modal.tsx b/apps/client/src/widgets/react/Modal.tsx
index 0ffceb112..072b8b688 100644
--- a/apps/client/src/widgets/react/Modal.tsx
+++ b/apps/client/src/widgets/react/Modal.tsx
@@ -8,10 +8,15 @@ interface ModalProps {
     size: "lg" | "sm";
     children: ComponentChildren;
     footer?: ComponentChildren;
+    /**
+     * If set, the modal body and footer will be wrapped in a form and the submit event will call this function.
+     * Especially useful for user input that can be submitted with Enter key.
+     */
+    onSubmit?: () => void;
     onShown?: () => void;
 }
 
-export default function Modal({ children, className, size, title, footer, onShown }: ModalProps) {
+export default function Modal({ children, className, size, title, footer, onShown, onSubmit }: ModalProps) {
     const modalRef = useRef<HTMLDivElement>(null);
 
     if (onShown) {
@@ -32,17 +37,36 @@ export default function Modal({ children, className, size, title, footer, onShow
                         <button type="button" className="btn-close" data-bs-dismiss="modal" aria-label={t("modal.close")}></button>
                     </div>
 
-                    <div className="modal-body">
-                        {children}
-                    </div>
-
-                    {footer && (
-                        <div className="modal-footer">
-                            {footer}
-                        </div>
+                    {onSubmit ? (
+                        <form onSubmit={(e) => {
+                            e.preventDefault();
+                            onSubmit();
+                        }}>
+                            <ModalInner footer={footer}>{children}</ModalInner>
+                        </form>
+                    ) : (
+                        <ModalInner footer={footer}>
+                            {children}
+                        </ModalInner>
                     )}
                 </div>
             </div>
         </div>
     );
+}
+
+function ModalInner({ children, footer }: Pick<ModalProps, "children" | "footer">) {
+    return (
+        <>
+            <div className="modal-body">
+                {children}
+            </div>
+
+            {footer && (
+                <div className="modal-footer">
+                    {footer}
+                </div>
+            )}
+        </>
+    );
 }
\ No newline at end of file