diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelsSelectionSheet.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelsSelectionSheet.kt
index 28dff7936..2d6246ba0 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelsSelectionSheet.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelsSelectionSheet.kt
@@ -28,69 +28,70 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import app.omnivore.omnivore.persistence.entities.SavedItemLabel
 import app.omnivore.omnivore.ui.library.LibraryViewModel
+import com.google.accompanist.flowlayout.FlowRow
 
 
-@Composable
-fun LabelsSelectionSheet(viewModel: LibraryViewModel) {
-  val isActive: Boolean by viewModel.showLabelsSelectionSheetLiveData.observeAsState(false)
-  val labels: List<SavedItemLabel> by viewModel.savedItemLabelsLiveData.observeAsState(listOf())
-  val currentSavedItemData = viewModel.currentSavedItemUnderEdit()
-
-  val modalBottomSheetState = rememberModalBottomSheetState(
-    ModalBottomSheetValue.HalfExpanded,
-    confirmStateChange = { it != ModalBottomSheetValue.Hidden }
-  )
-
-  if (isActive) {
-    ModalBottomSheetLayout(
-      sheetBackgroundColor = Color.Transparent,
-      sheetState = modalBottomSheetState,
-      sheetContent = {
-        BottomSheetUI {
-          if (currentSavedItemData != null) {
-            LabelsSelectionSheetContent(
-              labels = labels,
-              initialSelectedLabels = currentSavedItemData.labels,
-              onCancel = {
-                viewModel.showLabelsSelectionSheetLiveData.value = false
-                viewModel.labelsSelectionCurrentItemLiveData.value = null
-              },
-              isLibraryMode = false,
-              onSave = {
-                if (it != labels) {
-                  viewModel.updateSavedItemLabels(
-                    savedItemID = currentSavedItemData.savedItem.savedItemId,
-                    labels = it
-                  )
-                }
-                viewModel.labelsSelectionCurrentItemLiveData.value = null
-                viewModel.showLabelsSelectionSheetLiveData.value = false
-              },
-              onCreateLabel = { newLabelName, labelHexValue ->
-                viewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
-              }
-            )
-          } else { // Is used in library mode
-            LabelsSelectionSheetContent(
-              labels = labels,
-              initialSelectedLabels = viewModel.activeLabelsLiveData.value ?: listOf(),
-              onCancel = { viewModel.showLabelsSelectionSheetLiveData.value = false },
-              isLibraryMode = true,
-              onSave = {
-                viewModel.updateAppliedLabels(it)
-                viewModel.labelsSelectionCurrentItemLiveData.value = null
-                viewModel.showLabelsSelectionSheetLiveData.value = false
-              },
-              onCreateLabel = { newLabelName, labelHexValue ->
-                viewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
-              }
-            )
-          }
-        }
-      }
-    ) {}
-  }
-}
+//@Composable
+//fun LabelsSelectionSheet(viewModel: LibraryViewModel) {
+//  val isActive: Boolean by viewModel.showLabelsSelectionSheetLiveData.observeAsState(false)
+//  val labels: List<SavedItemLabel> by viewModel.savedItemLabelsLiveData.observeAsState(listOf())
+//  val currentSavedItemData = viewModel.currentSavedItemUnderEdit()
+//
+//  val modalBottomSheetState = rememberModalBottomSheetState(
+//    ModalBottomSheetValue.HalfExpanded,
+//    confirmStateChange = { it != ModalBottomSheetValue.Hidden }
+//  )
+//
+//  if (isActive) {
+//    ModalBottomSheetLayout(
+//      sheetBackgroundColor = Color.Transparent,
+//      sheetState = modalBottomSheetState,
+//      sheetContent = {
+//        BottomSheetUI {
+//          if (currentSavedItemData != null) {
+//            LabelsSelectionSheetContent(
+//              labels = labels,
+//              initialSelectedLabels = currentSavedItemData.labels,
+//              onCancel = {
+//                viewModel.showLabelsSelectionSheetLiveData.value = false
+//                viewModel.labelsSelectionCurrentItemLiveData.value = null
+//              },
+//              isLibraryMode = false,
+//              onSave = {
+//                if (it != labels) {
+//                  viewModel.updateSavedItemLabels(
+//                    savedItemID = currentSavedItemData.savedItem.savedItemId,
+//                    labels = it
+//                  )
+//                }
+//                viewModel.labelsSelectionCurrentItemLiveData.value = null
+//                viewModel.showLabelsSelectionSheetLiveData.value = false
+//              },
+//              onCreateLabel = { newLabelName, labelHexValue ->
+//                viewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
+//              }
+//            )
+//          } else { // Is used in library mode
+//            LabelsSelectionSheetContent(
+//              labels = labels,
+//              initialSelectedLabels = viewModel.activeLabelsLiveData.value ?: listOf(),
+//              onCancel = { viewModel.showLabelsSelectionSheetLiveData.value = false },
+//              isLibraryMode = true,
+//              onSave = {
+//                viewModel.updateAppliedLabels(it)
+//                viewModel.labelsSelectionCurrentItemLiveData.value = null
+//                viewModel.showLabelsSelectionSheetLiveData.value = false
+//              },
+//              onCreateLabel = { newLabelName, labelHexValue ->
+//                viewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
+//              }
+//            )
+//          }
+//        }
+//      }
+//    ) {}
+//  }
+//}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -132,6 +133,7 @@ fun LabelsSelectionSheetContent(
         .fillMaxSize()
         .padding(horizontal = 0.dp)
     ) {
+
       Row(
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically,
@@ -214,17 +216,3 @@ fun LabelsSelectionSheetContent(
     }
   }
 }
-
-@Composable
-private fun BottomSheetUI(content: @Composable () -> Unit) {
-  Box(
-    modifier = Modifier
-      .wrapContentHeight()
-      .fillMaxWidth()
-      .clip(RoundedCornerShape(topEnd = 20.dp, topStart = 20.dp))
-      .background(Color.White)
-      .statusBarsPadding()
-  ) {
-    content()
-  }
-}
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt
index 1e9b49dd4..20dbac19e 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt
@@ -33,38 +33,114 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import app.omnivore.omnivore.R
 import app.omnivore.omnivore.Routes
+import app.omnivore.omnivore.persistence.entities.SavedItemLabel
 import app.omnivore.omnivore.persistence.entities.SavedItemWithLabelsAndHighlights
-import app.omnivore.omnivore.ui.components.LabelsSelectionSheet
+import app.omnivore.omnivore.ui.components.LabelsSelectionSheetContent
 import app.omnivore.omnivore.ui.savedItemViews.SavedItemCard
 import app.omnivore.omnivore.ui.reader.PDFReaderActivity
 import app.omnivore.omnivore.ui.reader.WebReaderLoadingContainerActivity
-import app.omnivore.omnivore.ui.save.SaveSheetActivityBase
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
 @Composable
 fun LibraryView(
   libraryViewModel: LibraryViewModel,
   navController: NavHostController
 ) {
-  Scaffold(
-    topBar = {
-      LibraryNavigationBar(
-        savedItemViewModel = libraryViewModel,
-        onSearchClicked = { navController.navigate(Routes.Search.route) },
-        onSettingsIconClick = { navController.navigate(Routes.Settings.route) }
-      )
+  val showLabelsSelectionSheet: Boolean by libraryViewModel.showLabelsSelectionSheetLiveData.observeAsState(false)
 
-    },
-  ) { paddingValues ->
+  val coroutineScope = rememberCoroutineScope()
+  val modalBottomSheetState = rememberModalBottomSheetState(
+    ModalBottomSheetValue.Hidden,
+    confirmStateChange = { it != ModalBottomSheetValue.Hidden }
+  )
+
+  if (showLabelsSelectionSheet) {
+    coroutineScope.launch {
+      modalBottomSheetState.animateTo(ModalBottomSheetValue.HalfExpanded)
+    }
+  } else {
+    coroutineScope.launch {
+      modalBottomSheetState.hide()
+    }
+  }
+
+  ModalBottomSheetLayout(
+    sheetBackgroundColor = Color.Transparent,
+    sheetState = modalBottomSheetState,
+    sheetContent = {
+      BottomSheetContent(libraryViewModel)
+      Spacer(modifier = Modifier.weight(1.0F))
+    }
+  ) {
+    Scaffold(
+      topBar = {
+        LibraryNavigationBar(
+          savedItemViewModel = libraryViewModel,
+          onSearchClicked = { navController.navigate(Routes.Search.route) },
+          onSettingsIconClick = { navController.navigate(Routes.Settings.route) }
+        )
+      },
+    ) { paddingValues ->
       LibraryViewContent(
         libraryViewModel,
         modifier = Modifier
-          .padding(
-            top = paddingValues.calculateTopPadding()
-          )
+          .padding(top = paddingValues.calculateTopPadding())
       )
+    }
+  }
+}
+
+@Composable
+fun BottomSheetContent(libraryViewModel: LibraryViewModel) {
+  val showLabelsSelectionSheet: Boolean by libraryViewModel.showLabelsSelectionSheetLiveData.observeAsState(false)
+  val currentSavedItemData = libraryViewModel.currentSavedItemUnderEdit()
+  val labels: List<SavedItemLabel> by libraryViewModel.savedItemLabelsLiveData.observeAsState(listOf())
+
+  if (showLabelsSelectionSheet) {
+    BottomSheetUI {
+      if (currentSavedItemData != null) {
+        LabelsSelectionSheetContent(
+          labels = labels,
+          initialSelectedLabels = currentSavedItemData.labels,
+          onCancel = {
+            libraryViewModel.showLabelsSelectionSheetLiveData.value = false
+            libraryViewModel.labelsSelectionCurrentItemLiveData.value = null
+          },
+          isLibraryMode = false,
+          onSave = {
+            if (it != labels) {
+              libraryViewModel.updateSavedItemLabels(
+                savedItemID = currentSavedItemData.savedItem.savedItemId,
+                labels = it
+              )
+            }
+            libraryViewModel.labelsSelectionCurrentItemLiveData.value = null
+            libraryViewModel.showLabelsSelectionSheetLiveData.value = false
+          },
+          onCreateLabel = { newLabelName, labelHexValue ->
+            libraryViewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
+          }
+        )
+      } else { // Is used in library mode
+        LabelsSelectionSheetContent(
+          labels = labels,
+          initialSelectedLabels = libraryViewModel.activeLabelsLiveData.value ?: listOf(),
+          onCancel = { libraryViewModel.showLabelsSelectionSheetLiveData.value = false },
+          isLibraryMode = true,
+          onSave = {
+            libraryViewModel.updateAppliedLabels(it)
+            libraryViewModel.labelsSelectionCurrentItemLiveData.value = null
+            libraryViewModel.showLabelsSelectionSheetLiveData.value = false
+          },
+          onCreateLabel = { newLabelName, labelHexValue ->
+            libraryViewModel.createNewSavedItemLabel(newLabelName, labelHexValue)
+          }
+        )
+      }
+    }
   }
 }
 
@@ -137,10 +213,25 @@ fun LibraryViewContent(libraryViewModel: LibraryViewModel, modifier: Modifier) {
       modifier = Modifier.align(Alignment.TopCenter)
     )
 
-    LabelsSelectionSheet(viewModel = libraryViewModel)
+    // LabelsSelectionSheet(viewModel = libraryViewModel)
   }
 }
 
+@Composable
+private fun BottomSheetUI(content: @Composable () -> Unit) {
+  Box(
+    modifier = Modifier
+      .wrapContentHeight()
+      .fillMaxWidth()
+      .clip(RoundedCornerShape(topEnd = 20.dp, topStart = 20.dp))
+      .background(Color.White)
+      .statusBarsPadding()
+  ) {
+    content()
+  }
+}
+
+
 @Composable
 fun InfiniteListHandler(
   listState: LazyListState,