diff --git a/src/components/AddTrackModal.svelte b/src/components/AddTrackModal.svelte
index 0c11df23..6f94c10c 100644
--- a/src/components/AddTrackModal.svelte
+++ b/src/components/AddTrackModal.svelte
@@ -19,6 +19,20 @@
   $: isTracklengthValid = tracklength <= 0;
   $: trackMintimevalid = track_min_duration >= 0;
   $: createbtnenabled = !isTracknameValid && !isTracklengthValid;
+  (function () {
+    document.onkeydown = function (e) {
+      e = e || window.event;
+      if (e.key === "Escape") {
+        modal_open = false;
+      }
+      if (e.keyCode === 13) {
+        if (createbtnenabled === true) {
+          createbtnenabled = false;
+          submit();
+        }
+      }
+    };
+  })();
   function submit() {
     if (processed_last_submit === true) {
       processed_last_submit = false;