diff --git a/src/locales/ca_ES/command-ui-handler.ts b/src/locales/ca_ES/command-ui-handler.ts
index f36b5bfcdf1..c4c65db0aa0 100644
--- a/src/locales/ca_ES/command-ui-handler.ts
+++ b/src/locales/ca_ES/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "Ball",
   "pokemon": "Pokémon",
   "run": "Run",
-  "actionMessage": "What will {{pokemonName}} do?",
+  "actionMessage": "What will\n{{pokemonName}} do?",
 } as const;
diff --git a/src/locales/de/command-ui-handler.ts b/src/locales/de/command-ui-handler.ts
index c6bb0a9f60b..cd7da3fbf26 100644
--- a/src/locales/de/command-ui-handler.ts
+++ b/src/locales/de/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "Ball",
   "pokemon": "Pokémon",
   "run": "Fliehen",
-  "actionMessage": "Was soll {{pokemonName}} tun?",
+  "actionMessage": "Was soll\n{{pokemonName}} tun?",
 } as const;
diff --git a/src/locales/en/command-ui-handler.ts b/src/locales/en/command-ui-handler.ts
index f36b5bfcdf1..c4c65db0aa0 100644
--- a/src/locales/en/command-ui-handler.ts
+++ b/src/locales/en/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "Ball",
   "pokemon": "Pokémon",
   "run": "Run",
-  "actionMessage": "What will {{pokemonName}} do?",
+  "actionMessage": "What will\n{{pokemonName}} do?",
 } as const;
diff --git a/src/locales/es/command-ui-handler.ts b/src/locales/es/command-ui-handler.ts
index 406bfb692a9..5ddde2c983a 100644
--- a/src/locales/es/command-ui-handler.ts
+++ b/src/locales/es/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "Balls",
   "pokemon": "Pokémon",
   "run": "Huir",
-  "actionMessage": "¿Qué debería hacer {{pokemonName}}?",
+  "actionMessage": "¿Qué debería\nhacer {{pokemonName}}?",
 } as const;
diff --git a/src/locales/pt_BR/command-ui-handler.ts b/src/locales/pt_BR/command-ui-handler.ts
index 67c7cee893b..cd8f7c4a378 100644
--- a/src/locales/pt_BR/command-ui-handler.ts
+++ b/src/locales/pt_BR/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "Bolas",
   "pokemon": "Pokémon",
   "run": "Fugir",
-  "actionMessage": "O que {{pokemonName}} deve fazer?",
+  "actionMessage": "O que {{pokemonName}}\ndeve fazer?",
 } as const;
diff --git a/src/locales/zh_CN/command-ui-handler.ts b/src/locales/zh_CN/command-ui-handler.ts
index ee796a172cf..57397a930df 100644
--- a/src/locales/zh_CN/command-ui-handler.ts
+++ b/src/locales/zh_CN/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "精灵球",
   "pokemon": "宝可梦",
   "run": "逃跑",
-  "actionMessage": "要让 {{pokemonName}} 做什么？",
+  "actionMessage": "要让\n{{pokemonName}} 做什么？",
 } as const;
diff --git a/src/locales/zh_TW/command-ui-handler.ts b/src/locales/zh_TW/command-ui-handler.ts
index 8b68919225d..300b20224b3 100644
--- a/src/locales/zh_TW/command-ui-handler.ts
+++ b/src/locales/zh_TW/command-ui-handler.ts
@@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = {
   "ball": "精靈球",
   "pokemon": "寶可夢",
   "run": "逃跑",
-  "actionMessage": "要讓 {{pokemonName}} 做甚麼？",
+  "actionMessage": "要讓\n{{pokemonName}} 做甚麼？",
 } as const;
diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index 3378be5d024..024f64c619c 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -70,7 +70,7 @@ export default class CommandUiHandler extends UiHandler {
     const messageMaxWidth = this.scene.game.canvas.width - messageHandler.commandWindow.getBounds().width - messageHandler.message.getBounds().x;
     messageHandler.message.setWordWrapWidth(messageMaxWidth);
     const commandMessage = i18next.t("commandUiHandler:actionMessage", {pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon())});
-    messageHandler.adjustText(commandMessage,messageHandler.message,messageMaxWidth);
+    messageHandler.adjustText(commandMessage,messageHandler.message,messageMaxWidth,{ ignoreTextBalance:"all" });
 
     messageHandler.showText(commandMessage, 0);
     this.setCursor(this.getCursor());
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 04b18b9f487..320342a6531 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -517,10 +517,8 @@ export default class MenuUiHandler extends MessageUiHandler {
 
   showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void {
     this.menuMessageBoxContainer.setVisible(!!text);
-    const messageText = this.message;
-    const messageBox = this.messageBoxBg;
-    this.adjustText(text,messageText,messageBox.getBounds().width,{
-      padding: messageText.x,
+    this.adjustText(text, this.message, this.messageBoxBg.getBounds().width, {
+      padding: this.message.x,
       ignoreTextBalance: "all"
     });
 
diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts
index 5ed9eae271a..2dea136c523 100644
--- a/src/ui/message-ui-handler.ts
+++ b/src/ui/message-ui-handler.ts
@@ -7,7 +7,7 @@ import i18next from "i18next";
 type argsAjustText = {
   padding?:number;
   ignoreTextBalance?:Array<string>|"all";
-  ignoreLanguages?: Array<string>;
+  ignoreLanguages?:Array<string>;
 };
 
 export default abstract class MessageUiHandler extends AwaitableUiHandler {
@@ -227,8 +227,8 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
     textObject.setData("originalFontSize", textObject.getData("originalFontSize") ?? fontSize);
     textObject.setFontSize(fontSize);
 
-    const textWrapped = ()=>textObject.getWrappedText(text);
-    const textSize = ()=>Phaser.GameObjects.GetTextSize(textObject,textObject.style.getTextMetrics(),textWrapped());
+    const textWrapped = () => textObject.getWrappedText(text);
+    const textSize = () => Phaser.GameObjects.GetTextSize(textObject,textObject.style.getTextMetrics(),textWrapped());
     const balanceText = typeof opts.ignoreTextBalance === "string" ? opts.ignoreTextBalance === "all" : (opts.ignoreTextBalance && opts.ignoreTextBalance[0] && opts.ignoreTextBalance.some(localKey=> localKey === currentLanguage));
 
     // Text Balance