diff --git a/gui/main_window.py b/gui/main_window.py
index 7b5f47d..10c497b 100644
--- a/gui/main_window.py
+++ b/gui/main_window.py
@@ -126,12 +126,12 @@ class LeftPanel(QObject):
     def open_wallet(self, attempts: int = 2) -> WalletScreen:
         self._wallet_button.click()
         try:
-            return WalletScreen().wait_until_appears()
-        except AssertionError as err:
+            return WalletScreen()
+        except Exception as ex:
             if attempts:
                 return self.open_wallet(attempts - 1)
             else:
-                raise err
+                raise ex
 
 
 class MainWindow(Window):
diff --git a/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py b/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py
index bfd36bb..3540851 100644
--- a/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py
+++ b/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py
@@ -84,7 +84,6 @@ def test_settings_include_in_total_balance(main_screen: MainWindow, name, watche
         main_screen.left_panel.open_wallet().left_panel.hide_include_in_total_balance_from_context_menu(name)
 
     with step('Check the balance is back to 0 again'):
-        main_screen.left_panel.open_wallet()
         assert driver.waitFor(
             lambda: float(wallet_main_screen.left_panel.get_total_balance_value().replace("\xa0", "")
                           .replace(",", "")) == 0, configs.timeouts.UI_LOAD_TIMEOUT_MSEC), \