diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js
index 408872684..f2e1d51bd 100644
--- a/js/controllers/homeWallet.js
+++ b/js/controllers/homeWallet.js
@@ -4,12 +4,6 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
   $scope.init = function() {
     $rootScope.title = 'Home';
 
-    // fix for Safari and mobile devices
-    var walletId = $location.hash();
-    if (walletId) {
-      $location.hash('');
-      identityService.setFocusedWallet(walletId);
-    }
 
     $scope.rateService = rateService;
     $scope.isRateAvailable = false;
diff --git a/js/services/identityService.js b/js/services/identityService.js
index ad073f65b..5620e8e49 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -27,18 +27,18 @@ angular.module('copayApp.services')
       });
     };
 
-    // TODO should be on 'walletService'
+    // TODO should be on 'walletService' or 'go'
     root.goWalletHome = function() {
       var w = $rootScope.wallet;
       if (w) {
         $rootScope.starting = false;
         if (!w.isComplete()) {
-          $location.path('/copayers');
+          go.go('copayers');
         } else {
           if ($rootScope.pendingPayment) {
-            $location.path('paymentIntent');
+            go.go('paymentIntent');
           } else {
-            $location.path('homeWallet');
+            go.go('homeWallet');
           }
         }
       }
diff --git a/views/includes/walletbar-mobile.html b/views/includes/walletbar-mobile.html
index c356901a7..8aeb00f8b 100644
--- a/views/includes/walletbar-mobile.html
+++ b/views/includes/walletbar-mobile.html
@@ -11,7 +11,7 @@
       <div class="avatar-wallet">{{(item.name || item.id) | limitTo: 1}}</div>
     </div>
     <div class="col2">
-      <a ng-click="$root.go('/homeWallet#{{item.id}}')" class="size-12 wallet-item">
+      <a ng-click="switchWallet(item.id)" class="size-12 wallet-item">
         <div class="oh">
           <div class="right size-10 type-wallet">
             [ {{item.requiredCopayers}} of {{item.totalCopayers}} ]</div>