diff --git a/src/core/dynui.c b/src/core/dynui.c
index c2af95f86..921716a72 100644
--- a/src/core/dynui.c
+++ b/src/core/dynui.c
@@ -207,15 +207,26 @@ struct dynamic_item * dynui_item ( struct dynamic_ui *dynui,
  *
  * @v dynui		Dynamic user interface
  * @v key		Shortcut key
+ * @v index		Starting index
  * @ret item		User interface item, or NULL if not found
  */
-struct dynamic_item * dynui_shortcut ( struct dynamic_ui *dynui, int key ) {
+struct dynamic_item * dynui_shortcut ( struct dynamic_ui *dynui, int key,
+				       unsigned int index ) {
 	struct dynamic_item *item;
 
+	/* Do nothing unless shortcut key is set */
+	if ( ! key )
+		return NULL;
+
+	/* Search from current list index */
 	list_for_each_entry ( item, &dynui->items, list ) {
-		if ( key && ( key == item->shortcut ) )
+		if ( ( key == item->shortcut ) && ( item->index >= index ) )
 			return item;
 	}
 
+	/* If not found, search again from start of list */
+	if ( index )
+		return dynui_shortcut ( dynui, key, 0 );
+
 	return NULL;
 }
diff --git a/src/hci/tui/form_ui.c b/src/hci/tui/form_ui.c
index 2bce952fa..9fa0dbd12 100644
--- a/src/hci/tui/form_ui.c
+++ b/src/hci/tui/form_ui.c
@@ -480,7 +480,8 @@ static int form_loop ( struct form *form ) {
 			break;
 		default:
 			/* Move to input with matching shortcut key, if any */
-			item = dynui_shortcut ( form->dynui, key );
+			item = dynui_shortcut ( form->dynui, key,
+						scroll->current );
 			if ( item ) {
 				scroll->current = item->index;
 				if ( ! item->name )
diff --git a/src/hci/tui/menu_ui.c b/src/hci/tui/menu_ui.c
index f789a298f..b085be1bd 100644
--- a/src/hci/tui/menu_ui.c
+++ b/src/hci/tui/menu_ui.c
@@ -200,7 +200,8 @@ static int menu_loop ( struct menu_ui *ui, struct dynamic_item **selected ) {
 				chosen = 1;
 				break;
 			default:
-				item = dynui_shortcut ( ui->dynui, key );
+				item = dynui_shortcut ( ui->dynui, key,
+							ui->scroll.current );
 				if ( item ) {
 					ui->scroll.current = item->index;
 					if ( item->name ) {
diff --git a/src/include/ipxe/dynui.h b/src/include/ipxe/dynui.h
index e50c6ab49..2dd23873d 100644
--- a/src/include/ipxe/dynui.h
+++ b/src/include/ipxe/dynui.h
@@ -59,7 +59,7 @@ extern struct dynamic_ui * find_dynui ( const char *name );
 extern struct dynamic_item * dynui_item ( struct dynamic_ui *dynui,
 					  unsigned int index );
 extern struct dynamic_item * dynui_shortcut ( struct dynamic_ui *dynui,
-					      int key );
+					      int key, unsigned int index );
 extern int show_menu ( struct dynamic_ui *dynui, unsigned long timeout,
 		       unsigned long retimeout, const char *select,
 		       struct dynamic_item **selected );