diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index 91679a1f6..79fa14443 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -25,6 +25,7 @@ ApplicationWindow
 
     header: ToolBar {
         id: toolbar
+
         RowLayout {
             anchors.fill: parent
 
@@ -81,7 +82,7 @@ ApplicationWindow
             Image {
                 Layout.preferredWidth: constants.iconSizeSmall
                 Layout.preferredHeight: constants.iconSizeSmall
-                visible: Daemon.currentWallet.isWatchOnly
+                visible: Daemon.currentWallet && Daemon.currentWallet.isWatchOnly
                 source: '../../icons/eye1.png'
                 scale: 1.5
             }
@@ -212,4 +213,11 @@ ApplicationWindow
             dialog.open()
         }
     }
+
+    Connections {
+        target: AppController
+        function onUserNotify(message) {
+            var item = app.notificationPopup.createObject(app, {'text': message})
+        }
+    }
 }