diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
index d05f02b22..a23126576 100644
--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
@@ -526,6 +526,7 @@ private fun SearchTextField(
             .focusRequester(focusRequester)
             .onKeyEvent {
                 if (it.key == Key.Enter) {
+                    if (searchQuery.isBlank()) return@onKeyEvent false
                     onSearchExplicitlyTriggered()
                     true
                 } else {
@@ -540,6 +541,7 @@ private fun SearchTextField(
         ),
         keyboardActions = KeyboardActions(
             onSearch = {
+                if (searchQuery.isBlank()) return@KeyboardActions
                 onSearchExplicitlyTriggered()
             },
         ),