diff --git a/lib/components/appbar/gf_appbar.dart b/lib/components/appbar/gf_appbar.dart
index 0e7d62f2..c6416e67 100644
--- a/lib/components/appbar/gf_appbar.dart
+++ b/lib/components/appbar/gf_appbar.dart
@@ -434,8 +434,11 @@ class _GFAppBarState extends State<GFAppBar> {
             ),
             type: GFButtonType.transparent,
             onPressed: () {
+              widget.onSubmitted?.call("");
+              final controller = widget.searchController ?? _searchController;
               setState(() {
                 showSearchBar = !showSearchBar;
+                controller.text = "";
               });
             },
           ),