diff --git a/lib/ui/common/controls/circle_buttons.dart b/lib/ui/common/controls/circle_buttons.dart index 99c7384c..df752ed5 100644 --- a/lib/ui/common/controls/circle_buttons.dart +++ b/lib/ui/common/controls/circle_buttons.dart @@ -138,7 +138,11 @@ class BackBtn extends StatelessWidget { if (onPressed != null) { onPressed?.call(); } else { - Navigator.of(context).pop(); + if (context.canPop()) { + context.pop(); + } else { + context.go(ScreenPaths.home); + } } } }