diff --git a/frontend/src/components/Modal.vue b/frontend/src/components/Modal.vue
index 4669087..dcea488 100644
--- a/frontend/src/components/Modal.vue
+++ b/frontend/src/components/Modal.vue
@@ -32,6 +32,18 @@
     name: 'modal',
     props: {
       header: ''
+    },
+    mounted: function () {
+      document.addEventListener('keydown', (e) => {
+        // Close the model when escape is pressed
+        if (e.keyCode === 27) {
+          this.$emit('close')
+        }
+        // Send it when enter is pressed
+        if (e.keyCode === 13) {
+          this.$emit('submit')
+        }
+      })
     }
   }
 </script>