diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 300c82096..68c09216f 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -816,7 +816,7 @@ export default {
     windowResize() {
       this.executeRebuild()
     },
-
+    initListeners() {
       window.addEventListener('resize', this.windowResize)
 
       this.$nextTick(() => {
diff --git a/client/components/modals/BatchQuickMatchModel.vue b/client/components/modals/BatchQuickMatchModel.vue
index f6bcd9728..f5828209a 100644
--- a/client/components/modals/BatchQuickMatchModel.vue
+++ b/client/components/modals/BatchQuickMatchModel.vue
@@ -1,5 +1,5 @@
 <template>
-  <modals-modal v-model="show" name="batchQuickMatch" :processing="processing" :width="500" :height="'unset'">
+  <modals-modal v-model="show" name="batchQuickMatch" :processing="processing" :width="500" :height="'unset'" @submit="doBatchQuickMatch">
     <template #outer>
       <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
         <p class="text-3xl text-white truncate">{{ title }}</p>
diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue
index 31ea1e610..c51f0aa8a 100644
--- a/client/components/modals/Modal.vue
+++ b/client/components/modals/Modal.vue
@@ -108,6 +108,13 @@ export default {
       if (this.$store.state.innerModalOpen) return
       if (action === this.$hotkeys.Modal.CLOSE) {
         this.show = false
+      } else if (action === this.$hotkeys.Modal.SUBMIT) {
+        const activeElement = document.activeElement
+        // Don't submit if we are in a textarea or certain inputs
+        if (activeElement && ['TEXTAREA'].includes(activeElement.tagName)) {
+          return
+        }
+        this.$emit('submit')
       }
     },
     setShow() {
diff --git a/client/components/modals/item/MoveToLibraryModal.vue b/client/components/modals/item/MoveToLibraryModal.vue
index 29b4be95c..a1656b0a6 100644
--- a/client/components/modals/item/MoveToLibraryModal.vue
+++ b/client/components/modals/item/MoveToLibraryModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <modals-modal ref="modal" v-model="show" name="move-to-library" :width="400" :height="'unset'" :processing="processing">
+  <modals-modal ref="modal" v-model="show" name="move-to-library" :width="400" :height="'unset'" :processing="processing" @submit="moveItems">
     <template #outer>
       <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
         <p class="text-3xl text-white truncate">{{ $strings.LabelMoveToLibrary }}</p>
diff --git a/client/components/modals/item/SplitBookModal.vue b/client/components/modals/item/SplitBookModal.vue
index 8fa5c7b37..942054c47 100644
--- a/client/components/modals/item/SplitBookModal.vue
+++ b/client/components/modals/item/SplitBookModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <modals-modal ref="modal" v-model="show" name="split-book" :width="600" :height="'unset'" :processing="processing">
+  <modals-modal ref="modal" v-model="show" name="split-book" :width="600" :height="'unset'" :processing="processing" @submit="submit">
     <template #outer>
       <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
         <p class="text-3xl text-white truncate">{{ $strings.HeaderSplitBook || 'Split Book' }}</p>
diff --git a/client/components/prompt/Confirm.vue b/client/components/prompt/Confirm.vue
index 361765e2d..4076e9e3f 100644
--- a/client/components/prompt/Confirm.vue
+++ b/client/components/prompt/Confirm.vue
@@ -115,6 +115,25 @@ export default {
       this.$eventBus.$emit('showing-prompt', false)
       this.content.style.transform = 'scale(0)'
       this.el.remove()
+    },
+    handleKeyDown(e) {
+      if (!this.show) return
+      if (e.key === 'Enter') {
+        const activeElement = document.activeElement
+        // If an input is focused, let it handle the enter key if it wants, 
+        // but ui-checkbox is okay to override if needed.
+        // Actually for a simple confirm prompt, Enter should usually confirm.
+        if (activeElement && ['INPUT', 'TEXTAREA'].includes(activeElement.tagName) && activeElement.type !== 'checkbox') {
+          return
+        }
+        e.preventDefault()
+        e.stopPropagation()
+        this.confirm()
+      } else if (e.key === 'Escape') {
+        e.preventDefault()
+        e.stopPropagation()
+        this.nevermind()
+      }
     }
   },
   mounted() {
@@ -124,11 +143,14 @@ export default {
     this.content.style.transition = 'transform 0.25s cubic-bezier(0.16, 1, 0.3, 1)'
     this.el.style.opacity = 1
     this.el.remove()
+
+    window.addEventListener('keydown', this.handleKeyDown)
   },
   beforeDestroy() {
     if (this.show) {
       this.$eventBus.$emit('showing-prompt', false)
     }
+    window.removeEventListener('keydown', this.handleKeyDown)
   }
 }
 </script>
diff --git a/client/plugins/constants.js b/client/plugins/constants.js
index 8c71c1b8d..42dd12723 100644
--- a/client/plugins/constants.js
+++ b/client/plugins/constants.js
@@ -47,6 +47,7 @@ const Constants = {
 }
 
 const KeyNames = {
+  13: 'Enter',
   27: 'Escape',
   32: 'Space',
   37: 'ArrowLeft',
@@ -77,7 +78,8 @@ const Hotkeys = {
   Modal: {
     NEXT_PAGE: 'ArrowRight',
     PREV_PAGE: 'ArrowLeft',
-    CLOSE: 'Escape'
+    CLOSE: 'Escape',
+    SUBMIT: 'Enter'
   }
 }