diff --git a/js/src/features/compose/compose-overlay.tsx b/js/src/features/compose/compose-overlay.tsx
index 8a312e7..c37b741 100644
--- a/js/src/features/compose/compose-overlay.tsx
+++ b/js/src/features/compose/compose-overlay.tsx
@@ -178,7 +178,13 @@ export function ComposeOverlay({
     const handleKeyDown = (e: KeyboardEvent) => {
       const currentStep = stepRef.current;
 
-      if (currentStep === "typing" || currentStep === "configuring") return;
+      if (currentStep === "typing" || currentStep === "configuring") {
+        if (e.key === "Escape") {
+          e.preventDefault();
+          cancel();
+        }
+        return;
+      }
 
       const target = e.target as HTMLElement;
       if (
diff --git a/js/src/features/compose/configure-stream-step.tsx b/js/src/features/compose/configure-stream-step.tsx
index c6bad18..5c542c8 100644
--- a/js/src/features/compose/configure-stream-step.tsx
+++ b/js/src/features/compose/configure-stream-step.tsx
@@ -76,6 +76,7 @@ export function ConfigureStreamStep({
           <Label className="mb-1 text-xs text-white/50">Stream name</Label>
           <Input
             type="text"
+            autoFocus
             value={name}
             onChange={(e) => {
               setName(e.target.value);