diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchController.kt b/src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchController.kt
index ed30ed9..e76f30c 100644
--- a/src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchController.kt
+++ b/src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchController.kt
@@ -24,5 +24,14 @@ class SearchController(private val model: Model) {
             val searchMode = searchModeToggleGroup.selectedToggle.userData as SearchMode
             model.search(newValue, searchMode)
         }
+
+        searchModeToggleGroup.selectedToggleProperty().addListener { _, _, newValue ->
+            if (textFieldSearch.text.isNullOrBlank()) {
+                return@addListener
+            }
+
+            val searchMode = newValue.userData as SearchMode
+            model.search(textFieldSearch.text, searchMode)
+        }
     }
 }