diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
index bd4c54c54..0c5b10c38 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
@@ -846,9 +846,9 @@ fun BookshelfScreen(
                             val group = uiState.groups.getOrNull(pageIndex)
                             if (group != null) {
                                 val isSelectedGroup = group.groupId == uiState.selectedGroupId
-                                val books = uiState.allGroupBooks[group.groupId]
-                                    ?: if (isSelectedGroup) uiState.items
-                                    else persistentListOf()
+                                val books = if (isSelectedGroup) uiState.items
+                                    else uiState.allGroupBooks[group.groupId]
+                                    ?: persistentListOf()
                                 val canReorderBooks = isEditMode &&
                                         !uiState.isSearch &&
                                         (group.bookSort.takeIf { it >= 0 }
@@ -1052,17 +1052,10 @@ private fun BookshelfTopBar(
                     query = uiState.searchKey,
                     onQueryChange = onSearchQueryChange,
                     onSearch = onSearchSubmit,
-                    placeholder = stringResource(R.string.input_search_key),
-                    leadingIcon = {
-                        AppIcon(
-                            imageVector = AppIcons.Search,
-                            contentDescription = null
-                        )
-                    },
                     trailingIcon = {
                         if (uiState.searchKey.isNotEmpty()) {
                             SmallPlainButton(
-                                modifier = Modifier.padding(start = 12.dp),
+                                modifier = Modifier.padding(horizontal = 4.dp),
                                 onClick = onClearSearch,
                                 icon = AppIcons.Close,
                                 contentDescription = stringResource(R.string.clear)