diff --git a/lib/screens/libraries/filters_bottom_sheet.dart b/lib/screens/libraries/filters_bottom_sheet.dart
index d7f44b02..6391c7c5 100644
--- a/lib/screens/libraries/filters_bottom_sheet.dart
+++ b/lib/screens/libraries/filters_bottom_sheet.dart
@@ -157,6 +157,7 @@ class _FiltersBottomSheetState extends State<FiltersBottomSheet> {
     if (_currentFilter != null) {
       // Show filter options view
       return Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           // Header with back button
           BottomSheetHeader(
@@ -166,11 +167,13 @@ class _FiltersBottomSheetState extends State<FiltersBottomSheet> {
 
           // Filter options list
           if (_isLoadingValues)
-            const Expanded(child: Center(child: CircularProgressIndicator()))
+            const SizedBox(height: 120, child: Center(child: CircularProgressIndicator()))
           else
-            Expanded(
+            Flexible(
               child: ListView.builder(
                 controller: _valuesScrollController,
+                primary: false,
+                shrinkWrap: true,
                 padding: const EdgeInsets.symmetric(vertical: 8),
                 itemCount: _filterValues.length + 1,
                 itemBuilder: (context, index) {
@@ -218,6 +221,7 @@ class _FiltersBottomSheetState extends State<FiltersBottomSheet> {
 
     // Show main filters view
     return Column(
+      mainAxisSize: MainAxisSize.min,
       children: [
         // Header
         BottomSheetHeader(
@@ -238,8 +242,10 @@ class _FiltersBottomSheetState extends State<FiltersBottomSheet> {
         ),
 
         // All Filters (boolean toggles first, then regular filters)
-        Expanded(
+        Flexible(
           child: ListView.builder(
+            primary: false,
+            shrinkWrap: true,
             padding: const EdgeInsets.symmetric(vertical: 8),
             itemCount: _sortedFilters.length,
             itemBuilder: (context, index) {
diff --git a/lib/screens/libraries/sort_bottom_sheet.dart b/lib/screens/libraries/sort_bottom_sheet.dart
index cd2e1874..fa1e84ae 100644
--- a/lib/screens/libraries/sort_bottom_sheet.dart
+++ b/lib/screens/libraries/sort_bottom_sheet.dart
@@ -103,12 +103,13 @@ class _SortBottomSheetState extends State<SortBottomSheet> {
   @override
   Widget build(BuildContext context) {
     return Column(
+      mainAxisSize: MainAxisSize.min,
       children: [
         BottomSheetHeader(
           title: t.libraries.sortBy,
           action: widget.onClear != null ? TextButton(onPressed: _handleClear, child: Text(t.common.clear)) : null,
         ),
-        Expanded(
+        Flexible(
           child: RadioGroup<MediaSort>(
             groupValue: _currentSort,
             onChanged: (value) {
@@ -116,6 +117,8 @@ class _SortBottomSheetState extends State<SortBottomSheet> {
             },
             child: ListView.builder(
               controller: _scrollController,
+              primary: false,
+              shrinkWrap: true,
               padding: const EdgeInsets.symmetric(vertical: 8),
               itemCount: widget.sortOptions.length,
               itemBuilder: (context, index) {