diff --git a/electrum/gui/qml/components/ReceiveDialog.qml b/electrum/gui/qml/components/ReceiveDialog.qml
index 8dea47d81..5967161a2 100644
--- a/electrum/gui/qml/components/ReceiveDialog.qml
+++ b/electrum/gui/qml/components/ReceiveDialog.qml
@@ -298,16 +298,6 @@ ElDialog {
         }
     }
 
-    // make clicking the dialog background move the scope away from textedit fields
-    // so the keyboard goes away
-    MouseArea {
-        anchors.fill: parent
-        z: -1000
-        onClicked: parkFocus.focus = true
-        FocusScope { id: parkFocus }
-    }
-
-
     RequestDetails {
         id: request
         wallet: Daemon.currentWallet
diff --git a/electrum/gui/qml/components/controls/ElDialog.qml b/electrum/gui/qml/components/controls/ElDialog.qml
index 82da7759c..f663811e7 100644
--- a/electrum/gui/qml/components/controls/ElDialog.qml
+++ b/electrum/gui/qml/components/controls/ElDialog.qml
@@ -1,6 +1,7 @@
-import QtQuick 2.6
+import QtQuick 2.15
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.3
+import QtQuick.Controls.Material 2.0
 
 Dialog {
     id: abstractdialog
@@ -94,4 +95,11 @@ Dialog {
         }
     }
 
+    background: Rectangle {
+        id: bg
+        color: Material.dialogColor
+        TapHandler {
+            onTapped: bg.forceActiveFocus()
+        }
+    }
 }
diff --git a/electrum/gui/qml/components/wizard/Wizard.qml b/electrum/gui/qml/components/wizard/Wizard.qml
index e034a1489..89a2aba0b 100644
--- a/electrum/gui/qml/components/wizard/Wizard.qml
+++ b/electrum/gui/qml/components/wizard/Wizard.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.6
+import QtQuick 2.15
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.1
 
@@ -201,14 +201,4 @@ ElDialog {
         }
     }
 
-    // make clicking the dialog background move the scope away from textedit fields
-    // so the keyboard goes away
-    // TODO: here it works on desktop, but not android. hmm.
-    MouseArea {
-        anchors.fill: parent
-        z: -1000
-        onClicked: { parkFocus.focus = true }
-        FocusScope { id: parkFocus }
-    }
-
 }
diff --git a/electrum/gui/qml/components/wizard/WizardComponent.qml b/electrum/gui/qml/components/wizard/WizardComponent.qml
index f7ffd4ec0..87084ca03 100644
--- a/electrum/gui/qml/components/wizard/WizardComponent.qml
+++ b/electrum/gui/qml/components/wizard/WizardComponent.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.15
 import QtQuick.Controls 2.3
 import QtQuick.Controls.Material 2.0
 
@@ -18,6 +18,9 @@ Pane {
 
     background: Rectangle {
         color: Material.dialogColor
+        TapHandler {
+            onTapped: root.forceActiveFocus()
+        }
     }
 
     onAccept: {