diff --git a/src/api.imba b/src/api.imba
index 9640703..0b8000c 100644
--- a/src/api.imba
+++ b/src/api.imba
@@ -99,11 +99,6 @@ export default new class api
 		let i = set_link_selection_index Math.max(-1, state.link_selection_index - 1)
 		#link_input.focus! if i == -1
 
-	def navigate link
-		await increment_link_frequency link
-		#home_input.value = ""
-		new_tab link.url
-
 	get math_result
 		try
 			mexp.eval(state.query)
@@ -126,6 +121,10 @@ export default new class api
 		else
 			navigate link
 
+	def handle_input
+		set_link_selection_index 0
+		sort_links!
+
 	get bang
 		state.active_bang or config.data.default_bang
 
@@ -135,10 +134,18 @@ export default new class api
 	get encoded_bang_query_nourl
 		"{window.encodeURIComponent(state.query)}"
 
+	def new_tab(url)
+		window.open url,'_blank'
+
+	def navigate link, link_url
+		await increment_link_frequency link
+		state.query = ""
+		handle_input!
+		new_tab link_url || link.url
+
 	def handle_bang
 		return if state.loading
-		await increment_link_frequency bang
-		new_tab encoded_bang_query
+		navigate bang, encoded_bang_query
 
 	def unset_active_bang
 		state.active_bang = no
@@ -150,6 +157,3 @@ export default new class api
 
 	def help
 		new_tab "https://github.com/familyfriendlymikey/fuzzyhome"
-
-	def new_tab(url)
-		window.open url,'_blank'
diff --git a/src/components/app-home.imba b/src/components/app-home.imba
index 2a75534..7b69510 100644
--- a/src/components/app-home.imba
+++ b/src/components/app-home.imba
@@ -39,10 +39,6 @@ tag app-home
 			state.query = ''
 			api.sort_links!
 
-	def handle_input
-		api.set_link_selection_index 0
-		api.sort_links!
-
 	<self>
 		css w:100% d:flex fld:column ofy:hidden gap:20px
 		unless state.active_bang
@@ -96,7 +92,7 @@ tag app-home
 			<input$home-input
 				autofocus
 				bind=state.query
-				@input=handle_input
+				@input=api.handle_input
 				@cut=api.handle_cut
 				disabled=state.loading
 				@blur=blur