diff --git a/core/wiki/macros/keyboard-driven-input.tid b/core/wiki/macros/keyboard-driven-input.tid
index 9a172c904..b0a7ac9c0 100644
--- a/core/wiki/macros/keyboard-driven-input.tid
+++ b/core/wiki/macros/keyboard-driven-input.tid
@@ -21,13 +21,7 @@ $actions$
 </$list>
 \end
 
-\define input-next-actions(afterOrBefore:"after",reverse:"")
-<$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
-<$vars userInput={{{ [<__storeTitle__>get[text]] }}} selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}>
-<$set name="configTiddler" value={{{ [subfilter<__configTiddlerFilter__>] }}}>
-<$vars primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}} secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
-<$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
-<$set name="nextItem" value={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}>
+\define input-next-actions-inner()
 <$list filter="[<nextItem>minlength[1]]" variable="ignore">
 <$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
 <$list filter="[<__index__>match[]]">
@@ -38,7 +32,34 @@ $actions$
 </$list>
 <$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
 </$list>
+\end
+
+\define input-next-actions(afterOrBefore:"after",reverse:"")
+<$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
+<$vars userInput={{{ [<__storeTitle__>get[text]] }}} selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}>
+<$set name="configTiddler" value={{{ [subfilter<__configTiddlerFilter__>] }}}>
+<$vars primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}} secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
+<$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
+<$vars nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}} firstItem={{{ [enlist<filteredList>nth[1]] }}} lastItem={{{ [enlist<filteredList>last[]] }}}>
+<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
+<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+<<input-next-actions-inner>>
 </$set>
+</$list>
+<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
+<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+<<input-next-actions-inner>>
+</$set>
+</$list>
+<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
+<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
+<<input-next-actions-inner>>
+</$set>
+</$list>
+<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
+<<input-next-actions-inner>>
+</$list>
+</$vars>
 </$set>
 </$vars>
 </$set>