diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 90c0a074f11..d15688495c6 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -774,10 +774,14 @@ export default class PartyUiHandler extends MessageUiHandler {
           }
           this.showOptions();
           ui.playSelect();
-        } else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING) {
-          ui.playError();
-        } else {
-          return this.processInput(Button.CANCEL);
+        }
+        // Pressing return button
+        if (this.cursor === 6) {
+          if (this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING) {
+            ui.playError();
+          } else {
+            return this.processInput(Button.CANCEL);
+          }
         }
         return true;
       }