diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index cf66631bd96..214494cb94f 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -30,6 +30,15 @@ export class CommandPhase extends FieldPhase {
   start() {
     super.start();
 
+    const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND];
+    if (commandUiHandler) {
+      if (this.scene.currentBattle.turn === 1 || commandUiHandler.getCursor() === Command.POKEMON) {
+        commandUiHandler.setCursor(Command.FIGHT);
+      } else {
+        commandUiHandler.setCursor(commandUiHandler.getCursor());
+      }
+    }
+
     if (this.fieldIndex) {
       // If we somehow are attempting to check the right pokemon but there's only one pokemon out
       // Switch back to the center pokemon. This can happen rarely in double battles with mid turn switching
diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index 4b78a2a6112..a5eeb95c48d 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -68,11 +68,6 @@ export default class CommandUiHandler extends UiHandler {
     messageHandler.movesWindowContainer.setVisible(false);
     messageHandler.message.setWordWrapWidth(1110);
     messageHandler.showText(i18next.t("commandUiHandler:actionMessage", { pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()) }), 0);
-    if ((this.scene.currentBattle.turn <= 1 && !this.scene.currentBattle.started) || this.getCursor() === Command.POKEMON) {
-      this.setCursor(Command.FIGHT);
-    } else {
-      this.setCursor(this.getCursor());
-    }
 
     return true;
   }