diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index fe2ca0d4f..9ccc3cdaa 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -1,6 +1,6 @@
 <nav ng-controller="topbarController as topbar" class="tab-bar animated fadeIn">
   <section class="left-small">
-    <a class="p10" ng-show="!goBackToState && !closeToState  && !index.noFocusedWallet" 
+    <a class="p10" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet" 
       ng-click="index.openMenu()"><i class="fi-list size-24"></i>
     </a>
     <a ng-show="goBackToState"
@@ -10,11 +10,11 @@
   </section>
 
   <section class="right-small" ng-show="index.isComplete && !goBackToState">
-    <a ng-show="!closeToState" class="p10" 
+    <a ng-show="!closeToHome" class="p10" 
       ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
-    <a ng-show="closeToState" class="p10"
-      ng-click="$root.go(closeToState); closeToState = null">
-      {{'Done'|translate}}
+    <a ng-show="closeToHome"
+      ng-click="topbar.goHome(); closeToHome = null">
+      <span class="text-close">{{'Close'|translate}}</span>
     </a>
   </section>
 
diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js
index af4f625ed..8a9101f7e 100644
--- a/src/js/controllers/topbar.js
+++ b/src/js/controllers/topbar.js
@@ -124,4 +124,8 @@ angular.module('copayApp.controllers').controller('topbarController', function($
     }
   };
 
+  this.goHome = function() {
+    go.walletHome();
+  };
+
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index a6ec1ce51..d68255875 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -192,7 +192,7 @@ angular
             templateUrl: 'views/includes/topbar.html',
             controller: function($scope) {
               $scope.titleSection = 'Preferences';
-              $scope.closeToState = 'walletHome';
+              $scope.closeToHome = true;
             }
           }
         }
@@ -347,7 +347,7 @@ angular
             templateUrl: 'views/includes/topbar.html',
             controller: function($scope) {
               $scope.titleSection = 'Add wallet';
-              $scope.goBackToState = 'walletHome';
+              $scope.closeToHome = true;
             }
           }
         }
diff --git a/src/js/services/go.js b/src/js/services/go.js
index 8b1d1de47..71482e8c9 100644
--- a/src/js/services/go.js
+++ b/src/js/services/go.js
@@ -39,7 +39,6 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
   root.path = function(path, cb) {
     $state.transitionTo(path)
       .then(function() {
-        $rootScope.$emit('Local/SetTab', path);
         if (cb) return cb();
       });
     hideSidebars();