diff --git a/frontend/components/actions/CreateDirectoryDialog.vue b/frontend/components/actions/CreateDirectoryDialog.vue
index abce476..156da96 100644
--- a/frontend/components/actions/CreateDirectoryDialog.vue
+++ b/frontend/components/actions/CreateDirectoryDialog.vue
@@ -17,6 +17,10 @@ const creating = ref(false);
 const directoryNameValid = computed(() => dialog.value.trim().length > 0);
 
 async function submit() {
+    if (!directoryNameValid.value || creating.value) {
+        return;
+    }
+
     creating.value = true;
 
     const { success } = await createDirectory(warrenRoute.value, dialog.value);
@@ -27,6 +31,12 @@ async function submit() {
         dialog.reset();
     }
 }
+
+function onKeyDown(e: KeyboardEvent) {
+    if (e.key === 'Enter') {
+        submit();
+    }
+}
 </script>
 
 <template>
@@ -50,6 +60,7 @@ async function submit() {
                 aria-required="true"
                 autocomplete="off"
                 required
+                @keydown="onKeyDown"
             />
 
             <DialogFooter>
diff --git a/frontend/components/actions/RenameEntryDialog.vue b/frontend/components/actions/RenameEntryDialog.vue
index eb23d35..b5c9da1 100644
--- a/frontend/components/actions/RenameEntryDialog.vue
+++ b/frontend/components/actions/RenameEntryDialog.vue
@@ -16,7 +16,7 @@ const renaming = ref(false);
 const directoryNameValid = computed(() => dialog.value.trim().length > 0);
 
 async function submit() {
-    if (dialog.entry == null) {
+    if (dialog.entry == null || !directoryNameValid.value || renaming.value) {
         return;
     }
 
@@ -34,6 +34,12 @@ async function submit() {
         dialog.reset();
     }
 }
+
+function onKeyDown(e: KeyboardEvent) {
+    if (e.key === 'Enter') {
+        submit();
+    }
+}
 </script>
 
 <template>
@@ -54,6 +60,7 @@ async function submit() {
                 aria-required="true"
                 autocomplete="off"
                 required
+                @keydown="onKeyDown"
             />
 
             <DialogFooter>