diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 037f68fca..c215a2088 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -74,7 +74,7 @@
       <div class="oh">
         <div class="amount" ng-style="{'background-color':index.backgroundColor}">
           <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
-            <div ng-show="index.updateError" ng-click='index.openWallet()'>
+            <div ng-show="index.updateError" ng-click='index.openWallet(); index.updateTxHistory()'>
               <span translate>Could not update Wallet</span>
               <br><span translate>Tap to retry</span>
             </div>
@@ -84,7 +84,7 @@
               <br><span translate>Tap to retry</span>
             </div>
 
-            <div   ng-click='index.updateAll(); index.updateTxHistory()'  ng-show="!index.updateError && index.walletScanStatus != 'error'">
+            <div ng-click='index.updateAll(); index.updateTxHistory()'  ng-show="!index.updateError && index.walletScanStatus != 'error'">
               <strong class="size-36">{{index.totalBalanceStr}}</strong>
               <div class="size-14"
                 ng-if="index.totalBalanceAlternative">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 39e9ce28d..c82f3f227 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -659,26 +659,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.debouncedUpdate();
   });
 
-  $rootScope.$on('Local/Online', function(event) {
-    $log.debug('### Online event');
-    if (self.isOffline) self.debouncedUpdate();
-    self.isOffline = false;
-    self.offLineSince = null;
-  });
-
-  self.offLineSince = null;;
-  $rootScope.$on('Local/Offline', function(event) {
-    $log.debug('### Offline event');
-    if (!self.offLineSince) self.offLineSince = Date.now();
-
-    if (Date.now() - self.offLineSince > 30000) {
-      self.isOffline = true;
-      $timeout(function() {
-        $rootScope.$apply();
-      });
-    }
-  });
-
   $rootScope.$on('Local/BackupDone', function(event) {
     self.needsBackup = false;
     storageService.setBackupFlag(self.walletId, function(err) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 86aa52c4f..cb1c002e6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -46,18 +46,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     self.resetForm();
   });
 
-  var disableOnlineListener = $rootScope.$on('Local/Online', function() {
-    // This is needed then the apps go to sleep
-    self.bindTouchDown();
-  });
-
   var disableResumeListener = $rootScope.$on('Local/Resume', function() {
     // This is needed then the apps go to sleep
     self.bindTouchDown();
   });
 
-
-
   var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) {
     // This will slow down switch, do not add things here!
     switch (tab) {
@@ -77,7 +70,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     disableTabListener();
     disableFocusListener();
     disableResumeListener();
-    disableOnlineListener();
     $rootScope.hideMenuBar = false;
   });
 
diff --git a/src/js/init.js b/src/js/init.js
index 75e113534..81673661e 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -35,12 +35,6 @@ angular.element(document).ready(function() {
         }, 100);
       }, false);
 
-      // We are not emitting here, since when the BWS socket reconnects,
-      // update will be triggered  
-      document.addEventListener('offline', function() {
-        window.location = '#/cordova/offline';
-      }, false);
-
       // Back button event
       document.addEventListener('backbutton', function() {
         var loc = window.location;
diff --git a/src/js/routes.js b/src/js/routes.js
index 14b74f7f2..90c5815d6 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -402,9 +402,6 @@ angular
                 case 'resume':
                   $rootScope.$emit('Local/Resume');
                   break;
-                case 'offline':
-                  $rootScope.$emit('Local/Offline');
-                  break;
               };
               $timeout(function() {
                 $rootScope.$emit('Local/SetTab', 'walletHome', true);
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 956dc76ee..f76fed9f0 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit) {
 
     var root = {};
 
@@ -64,14 +64,14 @@ angular.module('copayApp.services')
 
         client.on('reconnect', function() {
           if (root.focusedClient.credentials.walletId == client.credentials.walletId) {
-            $rootScope.$emit('Local/Online');
+            $log.debug('### Online');
           }
         });
 
 
         client.on('reconnecting', function() {
           if (root.focusedClient.credentials.walletId == client.credentials.walletId) {
-            $rootScope.$emit('Local/Offline');
+            $log.debug('### Offline');
           }
         });