diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 3bd51bd98..266362ac4 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -567,7 +567,7 @@ export default class BattleScene extends Phaser.Scene {
 			[Button.LEFT]: [keyCodes.LEFT, keyCodes.A],
 			[Button.RIGHT]: [keyCodes.RIGHT, keyCodes.D],
 			[Button.SUBMIT]: [keyCodes.ENTER],
-			[Button.ACTION]: [keyCodes.ENTER, keyCodes.SPACE, keyCodes.Z],
+			[Button.ACTION]: [keyCodes.SPACE, keyCodes.ENTER, keyCodes.Z],
 			[Button.CANCEL]: [keyCodes.BACKSPACE, keyCodes.X],
 			[Button.MENU]: [keyCodes.ESC, keyCodes.M],
 			[Button.CYCLE_SHINY]: [keyCodes.R],
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index f27f46d11..4cc2ba526 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -357,6 +357,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     if (button === Button.SUBMIT) {
       if (this.tryStart(true))
         success = true;
+      else
+        error = true;
     } else if (this.startCursorObj.visible) {
       switch (button) {
         case Button.ACTION: