diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
index 40081474c..edb325fd9 100644
--- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
+++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackwallet/models/add_wallet_list_entity/sub_classes/eth_token_entity.dart';
 import 'package:stackwallet/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart';
+import 'package:stackwallet/pages/add_wallet_views/select_wallet_for_token_view.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
@@ -25,13 +27,17 @@ class AddWalletNextButton extends ConsumerWidget {
       onPressed: !enabled
           ? null
           : () {
-              final selectedCoin =
-                  ref.read(addWalletSelectedEntityStateProvider.state).state;
-
-              Navigator.of(context).pushNamed(
-                CreateOrRestoreWalletView.routeName,
-                arguments: selectedCoin,
-              );
+              if (selectedCoin is EthTokenEntity) {
+                Navigator.of(context).pushNamed(
+                  SelectWalletForTokenView.routeName,
+                  arguments: selectedCoin,
+                );
+              } else {
+                Navigator.of(context).pushNamed(
+                  CreateOrRestoreWalletView.routeName,
+                  arguments: selectedCoin,
+                );
+              }
             },
       style: enabled
           ? Theme.of(context)