diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 3465e6b2..fe09469b 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -225,7 +225,7 @@ class ChatListController extends State<ChatList>
 
   void onSearchEnter(String text) {
     if (text.isEmpty) {
-      cancelSearch();
+      cancelSearch(unfocus: false);
       return;
     }
 
@@ -236,14 +236,14 @@ class ChatListController extends State<ChatList>
     _coolDown = Timer(const Duration(milliseconds: 500), _search);
   }
 
-  void cancelSearch() {
+  void cancelSearch({bool unfocus = true}) {
     setState(() {
       searchController.clear();
       isSearchMode = false;
       roomSearchResult = userSearchResult = null;
       isSearching = false;
     });
-    FocusManager.instance.primaryFocus?.unfocus();
+    if (unfocus) FocusManager.instance.primaryFocus?.unfocus();
   }
 
   bool isTorBrowser = false;
diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart
index fb1e1950..96cb883e 100644
--- a/lib/pages/chat_list/chat_list_header.dart
+++ b/lib/pages/chat_list/chat_list_header.dart
@@ -67,16 +67,15 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget {
                             ),
                       suffixIcon: controller.isSearchMode
                           ? controller.isSearching
-                              ? const Align(
-                                  alignment: Alignment.centerRight,
-                                  child: Padding(
-                                    padding: EdgeInsets.symmetric(
-                                        vertical: 8.0, horizontal: 12),
-                                    child: SizedBox.square(
-                                      dimension: 24,
-                                      child: CircularProgressIndicator.adaptive(
-                                        strokeWidth: 2,
-                                      ),
+                              ? const Padding(
+                                  padding: EdgeInsets.symmetric(
+                                    vertical: 10.0,
+                                    horizontal: 12,
+                                  ),
+                                  child: SizedBox.square(
+                                    dimension: 24,
+                                    child: CircularProgressIndicator.adaptive(
+                                      strokeWidth: 2,
                                     ),
                                   ),
                                 )