diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 32ca4601d..1a7204a20 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -211,8 +211,9 @@ class ElectrumWindow(QMainWindow):
         self.dummy_address = a[0] if a else None
         self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
         self.current_account = self.wallet.storage.get("current_account", None)
-        title = 'Electrum ' + self.wallet.electrum_version + '  -  ' + os.path.basename(self.wallet.storage.path)
-        if self.wallet.is_watching_only(): title += ' [%s]' % (_('watching only'))
+        title = 'Electrum %s  -  %s' % (self.wallet.electrum_version, self.wallet.basename())
+        if self.wallet.is_watching_only():
+            title += ' [%s]' % (_('watching only'))
         self.setWindowTitle( title )
         self.update_history_tab()
         self.update_wallet()
@@ -536,7 +537,7 @@ class ElectrumWindow(QMainWindow):
                     text += "%s"%quote
 
                 if self.tray:
-                    self.tray.setToolTip(text)
+                    self.tray.setToolTip("%s (%s)" % (text, self.wallet.basename()))
                 icon = QIcon(":icons/status_connected.png")
         else:
             text = _("Not connected")
diff --git a/lib/wallet.py b/lib/wallet.py
index 6bf0af969..527fb6a19 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -231,6 +231,9 @@ class Abstract_Wallet(object):
     def get_action(self):
         pass
 
+    def basename(self):
+        return os.path.basename(self.storage.path)
+
     def convert_imported_keys(self, password):
         for k, v in self.imported_keys.items():
             sec = pw_decode(v, password)