diff --git a/packages/neon/neon/lib/src/pages/home.dart b/packages/neon/neon/lib/src/pages/home.dart
index 1153fd6c..6915eac4 100644
--- a/packages/neon/neon/lib/src/pages/home.dart
+++ b/packages/neon/neon/lib/src/pages/home.dart
@@ -202,15 +202,15 @@ class _HomePageState extends State<HomePage> {
                 ) =>
                     OptionBuilder<NavigationMode>(
                   option: _globalOptions.navigationMode,
-                  builder: (final context, final navigationMode) => BackButtonListener(
-                    onBackButtonPressed: () async {
+                  builder: (final context, final navigationMode) => WillPopScope(
+                    onWillPop: () async {
                       if (_scaffoldKey.currentState!.isDrawerOpen) {
                         Navigator.pop(context);
-                        return false;
+                        return true;
                       }
 
                       _scaffoldKey.currentState!.openDrawer();
-                      return true;
+                      return false;
                     },
                     child: Builder(
                       builder: (final context) {