diff --git a/wadsrc/static/zscript/engine/ui/menu/custommessagebox.zs b/wadsrc/static/zscript/engine/ui/menu/custommessagebox.zs
index 68a79417c..948d9046b 100644
--- a/wadsrc/static/zscript/engine/ui/menu/custommessagebox.zs
+++ b/wadsrc/static/zscript/engine/ui/menu/custommessagebox.zs
@@ -78,7 +78,7 @@ class CustomMessageBoxMenuBase : Menu abstract
 		}
 		else
 		{
-			arrowFont = ConFont;
+			arrowFont = ((textFont && textFont.GetGlyphHeight(0xd) > 0) ? textFont : ConFont);
 			destWidth = CleanWidth;
 			destHeight = CleanHeight;
 			selector = "\xd";
@@ -133,7 +133,7 @@ class CustomMessageBoxMenuBase : Menu abstract
 			if ((MenuTime() % 8) < 6)
 			{
 				screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection,
-					(destWidth/2 - 11) + OptionXOffset(messageSelection), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
+					(destWidth/2 - 3 - arrowFont.StringWidth(selector)) + OptionXOffset(messageSelection), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
 			}
 		}
 	}
diff --git a/wadsrc/static/zscript/engine/ui/menu/messagebox.zs b/wadsrc/static/zscript/engine/ui/menu/messagebox.zs
index 8e76cae31..a49ff6f3f 100644
--- a/wadsrc/static/zscript/engine/ui/menu/messagebox.zs
+++ b/wadsrc/static/zscript/engine/ui/menu/messagebox.zs
@@ -79,7 +79,7 @@ class MessageBoxMenu : Menu
 		}
 		else
 		{
-			arrowFont = ConFont;
+			arrowFont = ((textFont && textFont.GetGlyphHeight(0xd) > 0) ? textFont : ConFont);
 			destWidth = CleanWidth;
 			destHeight = CleanHeight;
 			selector = "\xd";
@@ -134,7 +134,7 @@ class MessageBoxMenu : Menu
 				if ((MenuTime() % 8) < 6)
 				{
 					screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection,
-						destWidth/2 - 11, y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
+						destWidth/2 - 3 - arrowFont.StringWidth(selector), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
 				}
 			}
 		}