diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index a481c03..deab020 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -447,7 +447,6 @@
 			break;
 		case VB_WARN_LANGUAGE:
 			/* Languages */
-			// TODO: we'll have to figure out how to display this
 			vb2_set_menu_items(VB_MENU_LANGUAGES,
 					   loc);
 			break;
@@ -769,7 +768,7 @@
 			break;
 		case VB_BUTTON_VOL_DOWN:
 		case VB_KEY_DOWN:
-			/* Do no wrap selection index */
+			/* Do not wrap selection index */
 			if (current_menu == VB_MENU_LANGUAGES) {
 				VbGetLocalizationCount(cparams, &menu_size);
 			}
@@ -1041,8 +1040,14 @@
 				break;
 			case VB_BUTTON_VOL_DOWN:
 			case VB_KEY_DOWN:
-				vb2_get_current_menu_size(current_menu, NULL,
-							  &menu_size);
+				/* Do not wrap selection index */
+				if (current_menu == VB_MENU_LANGUAGES) {
+					VbGetLocalizationCount(cparams, &menu_size);
+				}
+				else {
+					vb2_get_current_menu_size(current_menu,
+								  NULL, &menu_size);
+				}
 				if (current_menu_idx < menu_size-1)
 					current_menu_idx++;
 				vb2_draw_current_screen(ctx, cparams);