diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt b/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt
index 75b3e280..1dc48cb6 100644
--- a/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt
@@ -152,6 +152,8 @@ fun ExpandedSearchView(
             icon = Icons.Rounded.Close,
             description = stringResource(id = R.string.cancel),
             onClick = {
+                textFieldValue = TextFieldValue(text = "")
+                focusManager.clearFocus()
                 onExpanded(false)
                 onClose()
             }