diff --git a/menu.cpp b/menu.cpp
index 025bcc8..6569eff 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -2734,7 +2734,12 @@ void HandleUI(void)
 			{
 			case 0:
 				{
-					uint mode = (GetUARTMode() + (minus ? -1 : 1)) & 3;
+					uint mode = GetUARTMode();
+					do
+					{
+						mode = (mode + (minus ? -1 : 1)) & 3;
+					} while (mode && !GetUARTbaud(mode));
+
 					SetUARTMode(mode);
 					menustate = MENU_UART1;
 				}