diff --git a/lib/router.dart b/lib/router.dart
index 535123b..fc4e719 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -228,6 +228,13 @@ final router = GoRouter(
                     state.params['name']!,
                   ),
                   routes: [
+                    GoRoute(
+                      path: 'new',
+                      builder: (context, state) => GhIssueFormScreen(
+                        state.params['owner']!,
+                        state.params['name']!,
+                      ),
+                    ),
                     GoRoute(
                       path: ':number',
                       builder: (context, state) => GhIssueScreen(
@@ -236,13 +243,6 @@ final router = GoRouter(
                         int.parse(state.params['number']!),
                       ),
                     ),
-                    GoRoute(
-                      path: 'new',
-                      builder: (context, state) => GhIssueFormScreen(
-                        state.params['owner']!,
-                        state.params['name']!,
-                      ),
-                    ),
                   ],
                 ),
                 GoRoute(
@@ -359,6 +359,12 @@ final router = GoRouter(
                           prefix: state.queryParams['prefix'],
                         ),
                     routes: [
+                      GoRoute(
+                        path: 'new',
+                        builder: (context, state) => GlIssueFormScreen(
+                          int.parse(state.params['id']!),
+                        ),
+                      ),
                       GoRoute(
                         path: ':iid',
                         builder: (context, state) => GlIssueScreen(
@@ -366,12 +372,6 @@ final router = GoRouter(
                           int.parse(state.params['iid']!),
                         ),
                       ),
-                      GoRoute(
-                        path: 'new',
-                        builder: (context, state) => GlIssueFormScreen(
-                          int.parse(state.params['id']!),
-                        ),
-                      ),
                     ]),
                 GoRoute(
                   path: 'merge_requests',