diff --git a/lib/src/popover.dart b/lib/src/popover.dart
index b634269..7ae4cfc 100644
--- a/lib/src/popover.dart
+++ b/lib/src/popover.dart
@@ -85,7 +85,10 @@ Future<T?> showPopover<T extends Object?>({
   Duration transitionDuration = const Duration(milliseconds: 200),
   double radius = 8,
   List<BoxShadow> shadow = const [
-    BoxShadow(color: Color(0x1F000000), blurRadius: 5)
+    BoxShadow(
+      color: Color(0x1F000000),
+      blurRadius: 5,
+    )
   ],
   double arrowWidth = 24,
   double arrowHeight = 12,
@@ -116,11 +119,8 @@ Future<T?> showPopover<T extends Object?>({
   return Navigator.of(context, rootNavigator: true).push<T>(
     RawDialogRoute<T>(
       pageBuilder: (_, animation, __) {
-        return WillPopScope(
-          onWillPop: () {
-            onPop?.call();
-            return Future.value(true);
-          },
+        return PopScope(
+          onPopInvoked: (_) => onPop?.call(),
           child: PopoverItem(
             transition: transition,
             child: Builder(builder: bodyBuilder),
@@ -142,8 +142,8 @@ Future<T?> showPopover<T extends Object?>({
         );
       },
       barrierDismissible: barrierDismissible,
-      barrierLabel: barrierLabel ??=
-          MaterialLocalizations.of(context).modalBarrierDismissLabel,
+      // ignore: lines_longer_than_80_chars
+      barrierLabel: barrierLabel ??= MaterialLocalizations.of(context).modalBarrierDismissLabel,
       barrierColor: barrierColor,
       transitionDuration: transitionDuration,
       settings: routeSettings,