diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index d39d8b3eb..380086160 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -345,9 +345,9 @@ ApplicationWindow
 
     Connections {
         target: Daemon
-        function onWalletRequiresPassword() {
+        function onWalletRequiresPassword(name, path) {
             console.log('wallet requires password')
-            var dialog = openWalletDialog.createObject(app, { path: Daemon.path })
+            var dialog = openWalletDialog.createObject(app, { path: path, name: name })
             dialog.open()
         }
         function onWalletOpenError(error) {
@@ -445,6 +445,7 @@ ApplicationWindow
     property bool _lockDialogShown: false
 
     onActiveChanged: {
+        console.log('app active = ' + active)
         if (!active) {
             // deactivated
             _lastActive = Date.now()
diff --git a/electrum/gui/qml/qedaemon.py b/electrum/gui/qml/qedaemon.py
index 8ea470476..04448c2d2 100644
--- a/electrum/gui/qml/qedaemon.py
+++ b/electrum/gui/qml/qedaemon.py
@@ -114,6 +114,7 @@ class QEDaemon(AuthMixin, QObject):
     _new_wallet_wizard = None
     _server_connect_wizard = None
     _path = None
+    _name = None
     _use_single_password = False
     _password = None
 
@@ -123,7 +124,7 @@ class QEDaemon(AuthMixin, QObject):
     serverConnectWizardChanged = pyqtSignal()
 
     walletLoaded = pyqtSignal()
-    walletRequiresPassword = pyqtSignal()
+    walletRequiresPassword = pyqtSignal([str,str], arguments=['name','path'])
     walletOpenError = pyqtSignal([str], arguments=["error"])
     walletDeleteError = pyqtSignal([str,str], arguments=['code', 'message'])
 
@@ -137,7 +138,7 @@ class QEDaemon(AuthMixin, QObject):
     @pyqtSlot()
     def passwordValidityCheck(self):
         if not self._walletdb._validPassword:
-            self.walletRequiresPassword.emit()
+            self.walletRequiresPassword.emit(self._name, self._path)
 
     @pyqtSlot()
     @pyqtSlot(str)
@@ -153,6 +154,8 @@ class QEDaemon(AuthMixin, QObject):
             return
 
         self._path = standardize_path(self._path)
+        self._name = os.path.basename(self._path)
+
         self._logger.debug('load wallet ' + str(self._path))
 
         if not password:
@@ -230,10 +233,6 @@ class QEDaemon(AuthMixin, QObject):
 
         self.availableWallets.remove_wallet(path)
 
-    @pyqtProperty('QString')
-    def path(self):
-        return self._path
-
     @pyqtProperty(QEWallet, notify=walletLoaded)
     def currentWallet(self):
         return self._current_wallet