diff --git a/app/src/main/kotlin/androidx/compose/material3/SearchBar.kt b/app/src/main/kotlin/androidx/compose/material3/SearchBar.kt
index c4a1416bc..4103f44df 100644
--- a/app/src/main/kotlin/androidx/compose/material3/SearchBar.kt
+++ b/app/src/main/kotlin/androidx/compose/material3/SearchBar.kt
@@ -76,13 +76,11 @@ fun SearchBarInputField(
                 singleLine = true,
                 visualTransformation = VisualTransformation.None,
                 interactionSource = interactionSource,
-                label = label,
                 placeholder = placeholder,
                 leadingIcon = leadingIcon?.let { leading -> { Box(Modifier.offset(x = SearchBarIconOffsetX)) { leading() } } },
                 trailingIcon = trailingIcon?.let { trailing -> { Box(Modifier.offset(x = -SearchBarIconOffsetX)) { trailing() } } },
                 shape = SearchBarDefaults.inputFieldShape,
                 colors = colors,
-                contentPadding = TextFieldDefaults.contentPaddingWithLabel(),
                 container = {},
             )
         },
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 d0892038c..6a1d5f77f 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
@@ -546,8 +546,8 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: DestinationsNavigator) = c
             fabHidden = it
         },
         title = suitableTitle,
-        searchFieldState = searchFieldState,
         searchFieldHint = searchBarHint,
+        searchFieldState = searchFieldState,
         suggestionProvider = {
             GalleryDetailUrlParser.parse(it, false)?.run {
                 GalleryDetailUrlSuggestion(gid, token)
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
index 5c8c0de07..154366067 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
@@ -100,9 +100,9 @@ fun SearchBarScreen(
     onApplySearch: (String) -> Unit,
     expanded: Boolean,
     onExpandedChange: (Boolean) -> Unit,
-    title: String? = null,
+    title: String?,
+    searchFieldHint: String,
     searchFieldState: TextFieldState = rememberTextFieldState(),
-    searchFieldHint: String? = null,
     suggestionProvider: SuggestionProvider? = null,
     tagNamespace: Boolean = false,
     searchBarOffsetY: () -> Int = { 0 },
@@ -226,14 +226,10 @@ fun SearchBarScreen(
                     expanded = expanded,
                     onExpandedChange = onExpandedChange,
                     modifier = Modifier.widthIn(max = maxWidth - SearchBarHorizontalPadding * 2),
-                    label = title.ifNotNullThen {
-                        Text(title!!, overflow = TextOverflow.Ellipsis, maxLines = 1)
-                    }.takeUnless {
+                    placeholder = {
                         val contentActive by activeState.state
-                        expanded || contentActive || searchFieldState.text.isNotEmpty()
-                    },
-                    placeholder = searchFieldHint.ifNotNullThen {
-                        Text(searchFieldHint!!, overflow = TextOverflow.Ellipsis, maxLines = 1)
+                        val text = title.takeUnless { expanded || contentActive } ?: searchFieldHint
+                        Text(text, overflow = TextOverflow.Ellipsis, maxLines = 1)
                     },
                     leadingIcon = {
                         if (expanded) {