diff --git a/src/phases.ts b/src/phases.ts
index e2852e87c75..6956b004669 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -4820,7 +4820,7 @@ export class AttemptCapturePhase extends PokemonPhase {
                   }
                 },
                 onComplete: () => {
-                  this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex)); this.catch();
+                  this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex)); this.scene.gameData.setPokemonCaught(pokemon); this.catch();
                 }
               });
             };
@@ -4915,7 +4915,7 @@ export class AttemptCapturePhase extends PokemonPhase {
           }
         });
       };
-      Promise.all([ pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon) ]).then(() => {
+      Promise.all([ pokemon.hideInfo() ]).then(() => {
         if (this.scene.getParty().length === 6) {
           const promptRelease = () => {
             this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => {
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 704ce40791f..ab94610ecb5 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -485,10 +485,10 @@ export default class SummaryUiHandler extends UiHandler {
         if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
           this.hideMoveSelect();
         } else {
-          if (!ui.getMessageHandler().onActionInput) {
-            ui.setMode(Mode.PARTY);
-          } else {
+          if (ui.getMessageHandler().onActionInput) {
             ui.setMode(Mode.MESSAGE);
+          } else {
+            ui.setMode(Mode.PARTY);
           }
         }
         success = true;
@@ -499,6 +499,8 @@ export default class SummaryUiHandler extends UiHandler {
         case Button.DOWN:
           if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
             break;
+          } else if (ui.getMessageHandler().onActionInput) {
+            break;
           }
           const isDown = button === Button.DOWN;
           const party = this.scene.getParty();