diff --git a/electrum/gui/kivy/main.kv b/electrum/gui/kivy/main.kv
index 2a2470949..d124d7316 100644
--- a/electrum/gui/kivy/main.kv
+++ b/electrum/gui/kivy/main.kv
@@ -530,6 +530,7 @@ BoxLayout:
                 ActionOvrButton:
                     name: 'network'
                     text: _('Network')
+                    disabled: app.network is None
                 ActionOvrButton:
                     name: 'addresses_dialog'
                     text: _('Addresses')
diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
index 4d6feb85d..68b9f4edf 100644
--- a/electrum/gui/kivy/main_window.py
+++ b/electrum/gui/kivy/main_window.py
@@ -655,7 +655,7 @@ class ElectrumWindow(App, Logger):
             util.register_callback(self.set_num_peers, ['gossip_peers'])
             util.register_callback(self.set_unknown_channels, ['unknown_channels'])
         
-        if self.electrum_config.get('auto_connect') is None:
+        if self.network and self.electrum_config.get('auto_connect') is None:
             self.popup_dialog("first_screen")
             # load_wallet_on_start will be called later, after initial network setup is completed
         else: