diff --git a/app/radio_qth_map/devtools_options.yaml b/app/radio_qth_map/devtools_options.yaml
new file mode 100644
index 0000000..7e7e7f6
--- /dev/null
+++ b/app/radio_qth_map/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/app/radio_qth_map/lib/screen/add_operation_screen.dart b/app/radio_qth_map/lib/screen/add_operation_screen.dart
index 14f92df..8b8079e 100644
--- a/app/radio_qth_map/lib/screen/add_operation_screen.dart
+++ b/app/radio_qth_map/lib/screen/add_operation_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:radio_qth_map/data/amateur_radio_band.dart';
 import 'package:radio_qth_map/data/amateur_radio_mode.dart';
@@ -35,7 +36,7 @@ class _AddOperationScreenState extends State<AddOperationScreen> {
                 final repository = context.read<FirestoreRepository>();
                 await repository.storeOperations(_logList);
                 if (context.mounted) {
-                  Navigator.of(context).pop();
+                  context.pop();
                 }
               },
         label: Text(AppLocalizations.of(context)!.publish_log),
diff --git a/app/radio_qth_map/lib/screen/map_screen.dart b/app/radio_qth_map/lib/screen/map_screen.dart
index 4c75dbd..113fb0e 100644
--- a/app/radio_qth_map/lib/screen/map_screen.dart
+++ b/app/radio_qth_map/lib/screen/map_screen.dart
@@ -130,7 +130,7 @@ class MapScreenState extends State<MapScreen> {
       ),
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () {
-          context.go('/qso/add');
+          context.push('/qso/add');
         },
         label: Text(AppLocalizations.of(context)!.add_qso),
         icon: const Icon(Icons.add),