diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
index 9490df7bf..55e5953b4 100644
--- a/gui/qt/__init__.py
+++ b/gui/qt/__init__.py
@@ -184,6 +184,11 @@ class ElectrumGui:
             w = self.create_window_for_wallet(wallet)
         if uri:
             w.pay_to_URI(uri)
+        w.bring_to_top()
+        w.setWindowState(w.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
+
+        # this will activate the window
+        w.activateWindow()
         return w
 
     def close_window(self, window):
diff --git a/setup.py b/setup.py
index e9ebb62a1..0cb92f490 100755
--- a/setup.py
+++ b/setup.py
@@ -71,6 +71,8 @@ setup(
     },
     package_data={
         'electrum': [
+            'servers.json',
+            'servers_testnet.json',
             'currencies.json',
             'www/index.html',
             'wordlist/*.txt',