diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index 1aea5ee1c..f6c9a1778 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -96,8 +96,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
                 relPath.prepend(folder->remotePath());
             list = FolderMan::instance()->findFileInLocalFolders(relPath, ast->account());
             if (list.count() > 0) {
-                QString path = "file:///" + QString(list.at(0));
-                return QUrl(path);
+                return QUrl::fromLocalFile(list.at(0));
             }
             // File does not exist anymore? Let's try to open its path
             if (QFileInfo(relPath).exists()) {
diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 4c3fa4fb5..7eb07ec51 100644
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -417,12 +417,11 @@ ActivityListModel *User::getActivityModel()
 
 void User::openLocalFolder()
 {
-#ifdef Q_OS_WIN
-    QString path = "file:///" + this->getFolder()->path();
-#else
-    QString path = "file://" + this->getFolder()->path();
-#endif
-    QDesktopServices::openUrl(path);
+    const auto folder = getFolder();
+
+    if (folder != nullptr) {
+        QDesktopServices::openUrl(QUrl::fromLocalFile(folder->path()));
+    }
 }
 
 void User::login() const
@@ -764,6 +763,11 @@ bool UserModel::currentUserHasActivities()
     return _users[currentUserIndex()]->hasActivities();
 }
 
+bool UserModel::currentUserHasLocalFolder()
+{
+    return _users[currentUserIndex()]->getFolder() != nullptr;
+}
+
 void UserModel::fetchCurrentActivityModel()
 {
     _users[currentUserId()]->slotRefresh();
diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h
index 34672dc37..8245888f9 100644
--- a/src/gui/tray/UserModel.h
+++ b/src/gui/tray/UserModel.h
@@ -101,6 +101,7 @@ public:
     Q_INVOKABLE QString currentUserName();
     Q_INVOKABLE QString currentUserServer();
     Q_INVOKABLE bool currentUserHasActivities();
+    Q_INVOKABLE bool currentUserHasLocalFolder();
     Q_INVOKABLE bool currentServerHasTalk();
     Q_INVOKABLE int currentUserId();
     Q_INVOKABLE bool isUserConnected(const int &id);
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 3f23cad56..ce1cda2c4 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -30,6 +30,7 @@ Window {
         currentAccountAvatar.source = "image://avatars/currentUser"
         currentAccountUser.text = userModelBackend.currentUserName();
         currentAccountServer.text = userModelBackend.currentUserServer();
+        openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();
         trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;
         currentAccountStateIndicator.source = ""
         currentAccountStateIndicator.source = userModelBackend.isUserConnected(userModelBackend.currentUserId()) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
@@ -52,6 +53,7 @@ Window {
         }
         onNewUserSelected: {
             accountMenu.close();
+            openLocalFolderButton.visible = userModelBackend.currentUserHasLocalFolder();
             trayWindowTalkButton.visible = userModelBackend.currentServerHasTalk() ? true : false;
         }
     }
@@ -360,6 +362,7 @@ Window {
                     Layout.preferredWidth:  Style.trayWindowHeaderHeight
                     Layout.preferredHeight: Style.trayWindowHeaderHeight
                     flat: true
+                    visible: userModelBackend.currentUserHasLocalFolder()
 
                     icon.source: "qrc:///client/theme/white/folder.svg"
                     icon.width: Style.headerButtonIconSize