diff --git a/lib/branch/branch_selection_page.dart b/lib/branch/branch_selection_page.dart
index e53b58f..21830a2 100755
--- a/lib/branch/branch_selection_page.dart
+++ b/lib/branch/branch_selection_page.dart
@@ -93,7 +93,7 @@ class _BranchSelectionPageState extends State<BranchSelectionPage> {
             child: Text("Cancel"),
           ),
           TextButton(
-            onPressed: () => apiService.logout(),
+            onPressed: () => Navigator.of(context).pop(true),
             child: Text("Logout"),
           ),
         ],
diff --git a/lib/presentation/cdList.dart b/lib/presentation/cdList.dart
index 512a142..cf44a34 100644
--- a/lib/presentation/cdList.dart
+++ b/lib/presentation/cdList.dart
@@ -237,7 +237,7 @@ class _CdPoliciesListState extends State<CdPoliciesList> {
             child: Text("Cancel"),
           ),
           TextButton(
-            onPressed: () => apiService.logout(),
+            onPressed: () => Navigator.of(context).pop(true),
             child: Text("Logout"),
           ),
         ],
diff --git a/lib/presentation/cdTransactionDetails.dart b/lib/presentation/cdTransactionDetails.dart
index 72ffb39..f2f4e75 100755
--- a/lib/presentation/cdTransactionDetails.dart
+++ b/lib/presentation/cdTransactionDetails.dart
@@ -488,7 +488,7 @@ class _cdTransactionDetailsState extends State<cdTransactionDetails> {
             child: Text("Cancel"),
           ),
           TextButton(
-            onPressed: () => apiService.logout(),
+            onPressed: () => Navigator.of(context).pop(true),
             child: Text("Logout"),
           ),
         ],
diff --git a/lib/presentation/claims.dart b/lib/presentation/claims.dart
index 10a7373..180b275 100755
--- a/lib/presentation/claims.dart
+++ b/lib/presentation/claims.dart
@@ -449,7 +449,7 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
             child: Text("Cancel"),
           ),
           TextButton(
-            onPressed: () => apiService.logout(),
+            onPressed: () => Navigator.of(context).pop(true),
             child: Text("Logout"),
           ),
         ],
diff --git a/lib/presentation/policies.dart b/lib/presentation/policies.dart
index 93a18c7..448b417 100644
--- a/lib/presentation/policies.dart
+++ b/lib/presentation/policies.dart
@@ -250,7 +250,7 @@ class _policiesState extends State<policies>
                 child: Text("Cancel"),
               ),
               TextButton(
-                onPressed: () => apiService.logout(),
+                onPressed: () => Navigator.of(context).pop(true),
                 child: Text("Logout"),
               ),
             ],
@@ -331,16 +331,14 @@ class _policiesState extends State<policies>
   @override
   Widget build(BuildContext context) {
     return BaseLayout(
-      child: PopScope(
-        canPop: false,
-        onPopInvoked: (didPop) async {
-          if (didPop) return;
+      child: WillPopScope(
+        onWillPop: () async {
 
           final shouldLogout = await _showLogoutDialog();
 
           if (shouldLogout) {
             await apiService.logout();
-            if (!mounted) return;
+            if (!mounted) return false;
 
             Navigator.pushNamedAndRemoveUntil(
               context,
@@ -348,6 +346,7 @@ class _policiesState extends State<policies>
                   (route) => false,
             );
           }
+          return false;
         },
         child: buildPoliciesBody(
           openEnrollment: openForEnrollmentList,