diff --git a/gui/kivy/__init__.py b/gui/kivy/__init__.py
index fd9e61101..7b9941281 100644
--- a/gui/kivy/__init__.py
+++ b/gui/kivy/__init__.py
@@ -60,5 +60,3 @@ class ElectrumGui:
                            plugins = self.plugins,
                            gui_object=self)
         w.run()
-        if w.wallet:
-            self.config.save_last_wallet(w.wallet)
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
index 919203c06..69f39ef72 100644
--- a/gui/kivy/main_window.py
+++ b/gui/kivy/main_window.py
@@ -511,6 +511,8 @@ class ElectrumWindow(App):
 
     def on_stop(self):
         Logger.info('on_stop')
+        if self.wallet:
+            self.electrum_config.save_last_wallet(self.wallet)
         self.stop_wallet()
 
     def stop_wallet(self):