diff --git a/wadsrc/static/zscript/engine/ui/menu/listmenu.zs b/wadsrc/static/zscript/engine/ui/menu/listmenu.zs
index ed3c2ef16..2489e41a4 100644
--- a/wadsrc/static/zscript/engine/ui/menu/listmenu.zs
+++ b/wadsrc/static/zscript/engine/ui/menu/listmenu.zs
@@ -188,11 +188,12 @@ class ListMenu : Menu
 	override bool MenuEvent (int mkey, bool fromcontroller)
 	{
 		int oldSelect = mDesc.mSelectedItem;
-		int startedAt = max(0, mDesc.mSelectedItem);
+		int startedAt;
 
 		switch (mkey)
 		{
 		case MKEY_Up:
+			startedAt = mDesc.mSelectedItem < 0 ? 0 : mDesc.mSelectedItem;
 			do
 			{
 				if (--mDesc.mSelectedItem < 0) mDesc.mSelectedItem = mDesc.mItems.Size()-1;
@@ -203,6 +204,7 @@ class ListMenu : Menu
 			return true;
 
 		case MKEY_Down:
+			startedAt = mDesc.mSelectedItem < 0 ? mDesc.mItems.Size()-1 : mDesc.mSelectedItem;
 			do
 			{
 				if (++mDesc.mSelectedItem >= mDesc.mItems.Size()) mDesc.mSelectedItem = 0;