diff --git a/electrum b/electrum
index 1c5f4d7bb..3ad9b3473 100755
--- a/electrum
+++ b/electrum
@@ -109,7 +109,7 @@ def arg_parser():
     parser = optparse.OptionParser(usage=usage, add_help_option=False)
     parser.add_option("-h", "--help", action="callback", callback=print_help_cb, help="show this help text")
     parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk, text or stdio")
-    parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
+    parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path")
     parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
     parser.add_option("-d", "--daemon", action="store_true", dest="daemon", default=False, help="use daemon")
     parser.add_option("-C", "--concealed", action="store_true", dest="concealed", default=False, help="don't echo seed to console when restoring")
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
index ea1f6b789..cdd08a75c 100644
--- a/gui/qt/__init__.py
+++ b/gui/qt/__init__.py
@@ -149,6 +149,9 @@ class ElectrumGui:
 
     def main(self, url):
 
+        if self.config.get('wallet_path') is None and self.config.get('gui_last_wallet'):
+            self.config.read_only_options['wallet_path'] = self.config.get('gui_last_wallet')
+
         storage = WalletStorage(self.config)
         if storage.file_exists:
             try:
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index a51c64d87..72a4cc69c 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -298,7 +298,7 @@ class ElectrumWindow(QMainWindow):
         self.load_wallet(wallet)
         self.show()
         # save path
-        self.config.set_key('default_wallet_path', filename)
+        self.config.set_key('gui_last_wallet', filename)