diff --git a/electrum/gui/qml/components/wizard/WCWalletName.qml b/electrum/gui/qml/components/wizard/WCWalletName.qml
index 6fd14dcfa..6f7cbf784 100644
--- a/electrum/gui/qml/components/wizard/WCWalletName.qml
+++ b/electrum/gui/qml/components/wizard/WCWalletName.qml
@@ -22,6 +22,6 @@ WizardComponent {
     }
 
     Component.onCompleted: {
-        wallet_name.selectAll()
+        wallet_name.forceActiveFocus()
     }
 }
diff --git a/electrum/gui/qml/components/wizard/Wizard.qml b/electrum/gui/qml/components/wizard/Wizard.qml
index 2978ed6cf..1caf02899 100644
--- a/electrum/gui/qml/components/wizard/Wizard.qml
+++ b/electrum/gui/qml/components/wizard/Wizard.qml
@@ -5,6 +5,7 @@ import QtQuick.Controls 2.1
 Dialog {
     id: wizard
     modal: true
+    focus: true
 
     width: parent.width
     height: parent.height