diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt
index 280fb8254..9bf7dfed8 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt
@@ -101,7 +101,7 @@ fun GalleryList(
     var isRefreshing by remember { mutableStateOf(false) }
     val refreshState = rememberPullToRefreshState()
     Box(
-        modifier = modifier.fillMaxSize().pullToRefresh(
+        modifier = modifier.pullToRefresh(
             isRefreshing = isRefreshing,
             state = refreshState,
             enabled = data.loadState.refresh is LoadState.NotLoading,
@@ -129,7 +129,7 @@ fun GalleryList(
             val columnWidth by collectDetailSizeAsState()
             FastScrollLazyVerticalGrid(
                 columns = GridCells.Adaptive(columnWidth),
-                modifier = contentModifier,
+                modifier = contentModifier.fillMaxSize(),
                 state = detailListState,
                 contentPadding = contentPadding + PaddingValues(marginH, marginV),
                 verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.gallery_list_interval)),
@@ -159,7 +159,7 @@ fun GalleryList(
             val thumbColumns by Settings.thumbColumns.collectAsState()
             FastScrollLazyVerticalStaggeredGrid(
                 columns = StaggeredGridCells.Fixed(thumbColumns),
-                modifier = contentModifier,
+                modifier = contentModifier.fillMaxSize(),
                 state = thumbListState,
                 contentPadding = contentPadding + PaddingValues(marginH, marginV),
                 verticalItemSpacing = gridInterval,
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt
index 23ec9facc..d99a6d19e 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt
@@ -315,7 +315,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat
                     isRefreshing = false
                 }
             },
-            modifier = Modifier.fillMaxSize().imePadding().padding(top = paddingValues.calculateTopPadding()),
+            modifier = Modifier.imePadding().padding(top = paddingValues.calculateTopPadding()),
             state = refreshState,
             indicator = {
                 PullToRefreshDefaults.LoadingIndicator(
@@ -342,7 +342,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat
             val layoutDirection = LocalLayoutDirection.current
             val lazyListState = rememberLazyListState()
             LazyColumn(
-                modifier = Modifier.padding(horizontal = keylineMargin),
+                modifier = Modifier.fillMaxSize().padding(horizontal = keylineMargin),
                 state = lazyListState,
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 contentPadding = PaddingValues(