diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index 764e71a8c3f..77a248f7e68 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -68,7 +68,7 @@ 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.getCursor() === Command.POKEMON) {
+    if (this.scene.currentBattle.turn <= 1 && !this.scene.currentBattle.started) {
       this.setCursor(Command.FIGHT);
     } else {
       this.setCursor(this.getCursor());