diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
index 78bc343ea..fc7303d51 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
@@ -172,15 +172,11 @@ fun AnimatedVisibilityScope.GalleryListScreen(
 
     LaunchedEffect(urlBuilder) {
         if (urlBuilder.category != EhUtils.NONE) category = urlBuilder.category
-        if (urlBuilder.mode != MODE_TOPLIST) {
-            var keyword = urlBuilder.keyword.orEmpty()
-            if (urlBuilder.mode == MODE_TAG) {
-                keyword = wrapTagKeyword(keyword)
-            }
-            if (keyword.isNotBlank()) {
-                searchFieldState.setTextAndPlaceCursorAtEnd(keyword)
-            }
+        var keyword = urlBuilder.keyword.takeUnless { urlBuilder.mode == MODE_TOPLIST }.orEmpty()
+        if (urlBuilder.mode == MODE_TAG) {
+            keyword = wrapTagKeyword(keyword)
         }
+        searchFieldState.setTextAndPlaceCursorAtEnd(keyword)
     }
 
     val density = LocalDensity.current