diff --git a/electrum/gui/qml/components/ChannelOpenProgressDialog.qml b/electrum/gui/qml/components/ChannelOpenProgressDialog.qml
index 65d7d0086..1094974c8 100644
--- a/electrum/gui/qml/components/ChannelOpenProgressDialog.qml
+++ b/electrum/gui/qml/components/ChannelOpenProgressDialog.qml
@@ -16,12 +16,6 @@ ElDialog {
 
     allowClose: false
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     property alias state: s.state
     property alias error: errorText.text
     property alias info: infoText.text
diff --git a/electrum/gui/qml/components/CloseChannelDialog.qml b/electrum/gui/qml/components/CloseChannelDialog.qml
index 129bb44b3..a5ac0d707 100644
--- a/electrum/gui/qml/components/CloseChannelDialog.qml
+++ b/electrum/gui/qml/components/CloseChannelDialog.qml
@@ -18,11 +18,6 @@ ElDialog {
     title: qsTr('Close Channel')
     iconSource: Qt.resolvedUrl('../../icons/lightning_disconnected.png')
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
     property bool _closing: false
 
     closePolicy: Popup.NoAutoClose
diff --git a/electrum/gui/qml/components/ConfirmTxDialog.qml b/electrum/gui/qml/components/ConfirmTxDialog.qml
index 73097766f..1dc5b22c9 100644
--- a/electrum/gui/qml/components/ConfirmTxDialog.qml
+++ b/electrum/gui/qml/components/ConfirmTxDialog.qml
@@ -30,12 +30,6 @@ ElDialog {
     height: parent.height
     padding: 0
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     function updateAmountText() {
         btcValue.text = Config.formatSats(finalizer.effectiveAmount, false)
         fiatValue.text = Daemon.fx.enabled
diff --git a/electrum/gui/qml/components/CpfpBumpFeeDialog.qml b/electrum/gui/qml/components/CpfpBumpFeeDialog.qml
index 675c817ff..c60084f87 100644
--- a/electrum/gui/qml/components/CpfpBumpFeeDialog.qml
+++ b/electrum/gui/qml/components/CpfpBumpFeeDialog.qml
@@ -22,12 +22,6 @@ ElDialog {
     height: parent.height
     padding: 0
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
diff --git a/electrum/gui/qml/components/ExceptionDialog.qml b/electrum/gui/qml/components/ExceptionDialog.qml
index 843590156..5c325f2f6 100644
--- a/electrum/gui/qml/components/ExceptionDialog.qml
+++ b/electrum/gui/qml/components/ExceptionDialog.qml
@@ -15,12 +15,6 @@ ElDialog
 
     property bool _sending: false
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     width: parent.width
     height: parent.height
 
@@ -113,11 +107,6 @@ ElDialog
             property string reportText
 
             z: 3000
-            modal: true
-            parent: Overlay.overlay
-            Overlay.modal: Rectangle {
-                color: "#aa000000"
-            }
 
             width: parent.width
             height: parent.height
diff --git a/electrum/gui/qml/components/ExportTxDialog.qml b/electrum/gui/qml/components/ExportTxDialog.qml
index 7bfaec28f..b69461803 100644
--- a/electrum/gui/qml/components/ExportTxDialog.qml
+++ b/electrum/gui/qml/components/ExportTxDialog.qml
@@ -17,16 +17,9 @@ ElDialog {
 
     title: qsTr('Share Transaction')
 
-    parent: Overlay.overlay
-    modal: true
-
     width: parent.width
     height: parent.height
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/GenericShareDialog.qml b/electrum/gui/qml/components/GenericShareDialog.qml
index edab35c96..8a9b8e49c 100644
--- a/electrum/gui/qml/components/GenericShareDialog.qml
+++ b/electrum/gui/qml/components/GenericShareDialog.qml
@@ -15,16 +15,9 @@ ElDialog {
 
     title: ''
 
-    parent: Overlay.overlay
-    modal: true
-
     width: parent.width
     height: parent.height
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/ImportAddressesKeysDialog.qml b/electrum/gui/qml/components/ImportAddressesKeysDialog.qml
index 61940b67a..10a069b19 100644
--- a/electrum/gui/qml/components/ImportAddressesKeysDialog.qml
+++ b/electrum/gui/qml/components/ImportAddressesKeysDialog.qml
@@ -15,12 +15,6 @@ ElDialog {
 
     property bool valid: false
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     width: parent.width
     height: parent.height
 
diff --git a/electrum/gui/qml/components/ImportChannelBackupDialog.qml b/electrum/gui/qml/components/ImportChannelBackupDialog.qml
index 036159e26..42dce5d96 100644
--- a/electrum/gui/qml/components/ImportChannelBackupDialog.qml
+++ b/electrum/gui/qml/components/ImportChannelBackupDialog.qml
@@ -11,11 +11,6 @@ ElDialog {
 
     property bool valid: false
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
     width: parent.width
     height: parent.height
 
diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml
index a240a632a..4e31ed965 100644
--- a/electrum/gui/qml/components/InvoiceDialog.qml
+++ b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -21,12 +21,6 @@ ElDialog {
 
     padding: 0
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     property bool _canMax: invoice.invoiceType == Invoice.OnchainInvoice
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/LightningPaymentProgressDialog.qml b/electrum/gui/qml/components/LightningPaymentProgressDialog.qml
index 326bfc41d..db771afdf 100644
--- a/electrum/gui/qml/components/LightningPaymentProgressDialog.qml
+++ b/electrum/gui/qml/components/LightningPaymentProgressDialog.qml
@@ -17,12 +17,6 @@ ElDialog {
 
     title: qsTr('Paying Lightning Invoice...')
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     Item {
         id: s
         state: ''
diff --git a/electrum/gui/qml/components/LnurlPayRequestDialog.qml b/electrum/gui/qml/components/LnurlPayRequestDialog.qml
index 7d72965f5..4bbbc5cd3 100644
--- a/electrum/gui/qml/components/LnurlPayRequestDialog.qml
+++ b/electrum/gui/qml/components/LnurlPayRequestDialog.qml
@@ -15,12 +15,6 @@ ElDialog {
 
     property InvoiceParser invoiceParser
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     property bool valid: comment.text.length <= invoiceParser.lnurlData['comment_allowed']
diff --git a/electrum/gui/qml/components/LoadingWalletDialog.qml b/electrum/gui/qml/components/LoadingWalletDialog.qml
index a9f938350..b7c4ed5a1 100644
--- a/electrum/gui/qml/components/LoadingWalletDialog.qml
+++ b/electrum/gui/qml/components/LoadingWalletDialog.qml
@@ -13,11 +13,7 @@ ElDialog {
     title: qsTr('Loading Wallet')
     iconSource: Qt.resolvedUrl('../../icons/wallet.png')
 
-    modal: true
     parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
 
     x: Math.floor((parent.width - implicitWidth) / 2)
     y: Math.floor((parent.height - implicitHeight) / 2)
diff --git a/electrum/gui/qml/components/MessageDialog.qml b/electrum/gui/qml/components/MessageDialog.qml
index 51fd9da56..b8c10335c 100644
--- a/electrum/gui/qml/components/MessageDialog.qml
+++ b/electrum/gui/qml/components/MessageDialog.qml
@@ -18,16 +18,10 @@ ElDialog {
 
     signal yesClicked
 
-    parent: Overlay.overlay
-    modal: true
     z: 1 // raise z so it also covers dialogs using overlay as parent
 
     anchors.centerIn: parent
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
@@ -36,7 +30,7 @@ ElDialog {
             Layout.alignment: Qt.AlignHCenter
             TextArea {
                 id: message
-                Layout.preferredWidth: Overlay.overlay.width *2/3
+                Layout.preferredWidth: dialog.parent.width * 2/3
                 readOnly: true
                 wrapMode: TextInput.WordWrap
                 textFormat: richText ? TextEdit.RichText : TextEdit.PlainText
diff --git a/electrum/gui/qml/components/OpenChannelDialog.qml b/electrum/gui/qml/components/OpenChannelDialog.qml
index 05ae0049c..31fe0f4ee 100644
--- a/electrum/gui/qml/components/OpenChannelDialog.qml
+++ b/electrum/gui/qml/components/OpenChannelDialog.qml
@@ -13,17 +13,11 @@ ElDialog {
     title: qsTr("Open Lightning Channel")
     iconSource: Qt.resolvedUrl('../../icons/lightning.png')
 
-    parent: Overlay.overlay
-    modal: true
     padding: 0
 
     width: parent.width
     height: parent.height
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
diff --git a/electrum/gui/qml/components/OpenWalletDialog.qml b/electrum/gui/qml/components/OpenWalletDialog.qml
index a299c24e9..eb125e998 100644
--- a/electrum/gui/qml/components/OpenWalletDialog.qml
+++ b/electrum/gui/qml/components/OpenWalletDialog.qml
@@ -18,12 +18,6 @@ ElDialog {
     title: qsTr('Open Wallet')
     iconSource: Qt.resolvedUrl('../../icons/wallet.png')
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     focus: true
 
     width: parent.width * 4/5
diff --git a/electrum/gui/qml/components/OtpDialog.qml b/electrum/gui/qml/components/OtpDialog.qml
index 41ec51f85..feb961d4e 100644
--- a/electrum/gui/qml/components/OtpDialog.qml
+++ b/electrum/gui/qml/components/OtpDialog.qml
@@ -18,12 +18,6 @@ ElDialog {
     property bool _waiting: false
     property string _otpError
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     focus: true
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/PasswordDialog.qml b/electrum/gui/qml/components/PasswordDialog.qml
index a15ff532f..85d2dc853 100644
--- a/electrum/gui/qml/components/PasswordDialog.qml
+++ b/electrum/gui/qml/components/PasswordDialog.qml
@@ -17,17 +17,10 @@ ElDialog {
     property string password
     property string infotext
 
-    parent: Overlay.overlay
-    modal: true
-
     anchors.centerIn: parent
     width: parent.width * 4/5
     padding: 0
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     ColumnLayout {
         id: rootLayout
         width: parent.width
diff --git a/electrum/gui/qml/components/Pin.qml b/electrum/gui/qml/components/Pin.qml
index b27c4a671..180c4f0c9 100644
--- a/electrum/gui/qml/components/Pin.qml
+++ b/electrum/gui/qml/components/Pin.qml
@@ -17,8 +17,6 @@ ElDialog {
 
     anchors.centerIn: parent
 
-    modal: true
-    parent: Overlay.overlay
     Overlay.modal: Rectangle {
         color: canCancel ? "#aa000000" : "#ff000000"
     }
diff --git a/electrum/gui/qml/components/ProxyConfigDialog.qml b/electrum/gui/qml/components/ProxyConfigDialog.qml
index 218fe3ad4..503bf57ac 100644
--- a/electrum/gui/qml/components/ProxyConfigDialog.qml
+++ b/electrum/gui/qml/components/ProxyConfigDialog.qml
@@ -12,16 +12,9 @@ ElDialog {
 
     title: qsTr('Proxy settings')
 
-    parent: Overlay.overlay
-    modal: true
-
     width: parent.width
     height: parent.height
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/RbfBumpFeeDialog.qml b/electrum/gui/qml/components/RbfBumpFeeDialog.qml
index 7f7164cbd..e5bea81bb 100644
--- a/electrum/gui/qml/components/RbfBumpFeeDialog.qml
+++ b/electrum/gui/qml/components/RbfBumpFeeDialog.qml
@@ -22,12 +22,6 @@ ElDialog {
     height: parent.height
     padding: 0
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
diff --git a/electrum/gui/qml/components/RbfCancelDialog.qml b/electrum/gui/qml/components/RbfCancelDialog.qml
index 06dd9b7d9..1f561aa88 100644
--- a/electrum/gui/qml/components/RbfCancelDialog.qml
+++ b/electrum/gui/qml/components/RbfCancelDialog.qml
@@ -21,12 +21,6 @@ ElDialog {
     height: parent.height
     padding: 0
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
diff --git a/electrum/gui/qml/components/ReceiveDetailsDialog.qml b/electrum/gui/qml/components/ReceiveDetailsDialog.qml
index f74998937..4d954a2fe 100644
--- a/electrum/gui/qml/components/ReceiveDetailsDialog.qml
+++ b/electrum/gui/qml/components/ReceiveDetailsDialog.qml
@@ -17,13 +17,6 @@ ElDialog {
     property alias description: message.text
     property alias expiry: expires.currentValue
 
-    parent: Overlay.overlay
-    modal: true
-
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/ReceiveDialog.qml b/electrum/gui/qml/components/ReceiveDialog.qml
index 1372b9a72..d7c6553bb 100644
--- a/electrum/gui/qml/components/ReceiveDialog.qml
+++ b/electrum/gui/qml/components/ReceiveDialog.qml
@@ -23,14 +23,8 @@ ElDialog {
 
     property bool _ispaid: false
 
-    parent: Overlay.overlay
-    modal: true
     iconSource: Qt.resolvedUrl('../../icons/tab_receive.png')
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/SendDialog.qml b/electrum/gui/qml/components/SendDialog.qml
index d6e3471a8..49ee44afa 100644
--- a/electrum/gui/qml/components/SendDialog.qml
+++ b/electrum/gui/qml/components/SendDialog.qml
@@ -15,13 +15,6 @@ ElDialog {
     signal txFound(data: string)
     signal channelBackupFound(data: string)
 
-    parent: Overlay.overlay
-    modal: true
-
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     header: Item {}
     padding: 0
     topPadding: 0
diff --git a/electrum/gui/qml/components/ServerConfigDialog.qml b/electrum/gui/qml/components/ServerConfigDialog.qml
index edd16ea49..b9664220f 100644
--- a/electrum/gui/qml/components/ServerConfigDialog.qml
+++ b/electrum/gui/qml/components/ServerConfigDialog.qml
@@ -12,16 +12,9 @@ ElDialog {
 
     title: qsTr('Server settings')
 
-    parent: Overlay.overlay
-    modal: true
-
     width: parent.width
     height: parent.height
 
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml
index 51057709b..0a1b25ca5 100644
--- a/electrum/gui/qml/components/SwapDialog.qml
+++ b/electrum/gui/qml/components/SwapDialog.qml
@@ -18,12 +18,6 @@ ElDialog {
     title: qsTr('Lightning Swap')
     iconSource: Qt.resolvedUrl('../../icons/update.png')
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     padding: 0
 
     ColumnLayout {
diff --git a/electrum/gui/qml/components/SwapProgressDialog.qml b/electrum/gui/qml/components/SwapProgressDialog.qml
index ec3434808..308aecdb1 100644
--- a/electrum/gui/qml/components/SwapProgressDialog.qml
+++ b/electrum/gui/qml/components/SwapProgressDialog.qml
@@ -20,12 +20,6 @@ ElDialog {
         ? qsTr('Reverse swap...')
         : qsTr('Swap...')
 
-    modal: true
-    parent: Overlay.overlay
-    Overlay.modal: Rectangle {
-        color: "#aa000000"
-    }
-
     Item {
         id: s
         state: ''
diff --git a/electrum/gui/qml/components/controls/ElDialog.qml b/electrum/gui/qml/components/controls/ElDialog.qml
index ed7865bc1..1caa8e71d 100644
--- a/electrum/gui/qml/components/controls/ElDialog.qml
+++ b/electrum/gui/qml/components/controls/ElDialog.qml
@@ -12,6 +12,12 @@ Dialog {
         close()
     }
 
+    parent: Overlay.overlay
+    modal: true
+    Overlay.modal: Rectangle {
+        color: "#aa000000"
+    }
+
     closePolicy: allowClose
         ? Popup.CloseOnEscape | Popup.CloseOnPressOutside
         : Popup.NoAutoClose
diff --git a/electrum/gui/qml/components/wizard/Wizard.qml b/electrum/gui/qml/components/wizard/Wizard.qml
index 8db489eca..c2c38329e 100644
--- a/electrum/gui/qml/components/wizard/Wizard.qml
+++ b/electrum/gui/qml/components/wizard/Wizard.qml
@@ -6,11 +6,11 @@ import "../controls"
 
 ElDialog {
     id: wizard
-    modal: true
     focus: true
 
     width: parent.width
     height: parent.height
+
     padding: 0
 
     title: wizardTitle + (pages.currentItem.title ? ' - ' + pages.currentItem.title : '')