diff --git a/core/entry/entry.go b/core/entry/entry.go
index 2183988..921e9f5 100644
--- a/core/entry/entry.go
+++ b/core/entry/entry.go
@@ -360,9 +360,10 @@ func (c *Controller) SelectMatch(index int) {
 		return
 	}
 
-	c.input.callsign = matches[index]
-	c.enterCallsign(matches[index])
-	c.showInput()
+	c.activeField = core.CallsignField
+	c.Enter(matches[index])
+	c.view.SetCallsign(c.input.callsign)
+	c.GotoNextField()
 }
 
 func (c *Controller) Enter(text string) {