diff --git a/static/app/components/events/autofix/v3/nextStep.tsx b/static/app/components/events/autofix/v3/nextStep.tsx
index 5e3375cad8a391..2a2f8278578183 100644
--- a/static/app/components/events/autofix/v3/nextStep.tsx
+++ b/static/app/components/events/autofix/v3/nextStep.tsx
@@ -314,6 +314,17 @@ function NextStepTemplate({
           placeholder={placeholderPrompt}
           value={userContext}
           onChange={event => setUserContext(event.target.value)}
+          onKeyDown={e => {
+            if (e.nativeEvent.isComposing) {
+              return;
+            }
+            if (e.key === 'Enter' && !e.shiftKey) {
+              e.preventDefault();
+              if (!isProcessing && userContext.trim()) {
+                onClickNo(userContext);
+              }
+            }
+          }}
         />
         <Flex gap="md">
           <Button disabled={isProcessing} onClick={onClickYes}>
@@ -321,7 +332,7 @@ function NextStepTemplate({
           </Button>
           <Button
             priority="primary"
-            disabled={isProcessing}
+            disabled={isProcessing || !userContext.trim()}
             onClick={() => onClickNo(userContext)}
           >
             {labelRethink}