diff --git a/electrum/base_wizard.py b/electrum/base_wizard.py
index de1cc392f..1193cd679 100644
--- a/electrum/base_wizard.py
+++ b/electrum/base_wizard.py
@@ -621,11 +621,3 @@ class BaseWizard(object):
             self.line_dialog(run_next=f, title=title, message=message, default='', test=lambda x: x==passphrase)
         else:
             f('')
-
-    def create_addresses(self):
-        def task():
-            self.wallet.synchronize()
-            self.wallet.storage.write()
-            self.terminate()
-        msg = _("Electrum is generating your addresses, please wait...")
-        self.waiting_dialog(task, msg)
diff --git a/electrum/wallet.py b/electrum/wallet.py
index e19fffcc7..eb96279fe 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -1506,6 +1506,9 @@ class Deterministic_Wallet(Abstract_Wallet):
     def __init__(self, storage):
         Abstract_Wallet.__init__(self, storage)
         self.gap_limit = storage.get('gap_limit', 20)
+        # generate addresses now. note that without libsecp this might block
+        # for a few seconds!
+        self.synchronize()
 
     def has_seed(self):
         return self.keystore.has_seed()