diff --git a/lib/screens/libraries/libraries_screen.dart b/lib/screens/libraries/libraries_screen.dart
index 79f8919e..328db280 100644
--- a/lib/screens/libraries/libraries_screen.dart
+++ b/lib/screens/libraries/libraries_screen.dart
@@ -1075,7 +1075,7 @@ class _LibraryManagementSheetState extends State<_LibraryManagementSheet> {
           _originalOrder = null;
         });
       } else {
-        Navigator.pop(context);
+        OverlaySheetController.popAdaptive(context);
       }
     });
     if (backResult != KeyEventResult.ignored) {
diff --git a/lib/widgets/overlay_sheet.dart b/lib/widgets/overlay_sheet.dart
index 0116337e..070f8dd1 100644
--- a/lib/widgets/overlay_sheet.dart
+++ b/lib/widgets/overlay_sheet.dart
@@ -512,7 +512,7 @@ class _OverlaySheetHostState extends State<OverlaySheetHost> with SingleTickerPr
 
     final colorScheme = Theme.of(context).colorScheme;
 
-    Widget content = _pageStack.isNotEmpty ? _pageStack.last.builder(context) : const SizedBox.shrink();
+    Widget content = _pageStack.isNotEmpty ? Builder(builder: _pageStack.last.builder) : const SizedBox.shrink();
 
     // Wrap content in NotificationListener for scroll-aware drag-to-dismiss
     if (showHandle) {