diff --git a/src/components/DevboxActionsMenu.tsx b/src/components/DevboxActionsMenu.tsx
index 3299183..6603640 100644
--- a/src/components/DevboxActionsMenu.tsx
+++ b/src/components/DevboxActionsMenu.tsx
@@ -380,7 +380,10 @@ export const DevboxActionsMenu = ({
       ] as const;
       const currentFieldIndex = snapshotFields.indexOf(snapshotFormField);
 
-      if (input === "q" || key.escape) {
+      const isInTextField =
+        snapshotFormField === "name" ||
+        snapshotFormField === "commit_message";
+      if (key.escape || (!isInTextField && input === "q")) {
         // Cancel snapshot form
         setSnapshotFormMode(false);
         setSnapshotName("");