diff --git a/.gitignore b/.gitignore
index 85a87ed91464e..9a97cd7c4e665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ doc/_build/*
 *.kdev4
 admin/win/nsi/l10n/pofiles/*.po
 *.swp
+*.swo
 *~$
 build*
 cscope.*
diff --git a/src/gui/tray/.wheelhandler.h.swo b/src/gui/tray/.wheelhandler.h.swo
deleted file mode 100644
index ab3ea46e26d47..0000000000000
Binary files a/src/gui/tray/.wheelhandler.h.swo and /dev/null differ
diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index c02dd1b73cbe7..627a6a66212b1 100644
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -97,8 +97,8 @@ ApplicationWindow {
 
             if (Systray.isOpen) {
                 trayWindowHeader.currentAccountHeaderButton.accountMenu.close();
-                appsMenu.close();
-                openLocalFolderButton.closeMenu()
+                trayWindowHeader.appsMenu.close();
+                trayWindowHeader.openLocalFolderButton.closeMenu()
             }
         }
 
diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index 6da6f9ca914cb..f98cad514b920 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -222,8 +222,8 @@ HeaderButton {
             }
 
             Component.onCompleted: {
-                foldersMenuLoader.openMenu = open
-                foldersMenuLoader.closeMenu = close
+                foldersMenuLoader.openMenu = function() { open() }
+                foldersMenuLoader.closeMenu = function() { close() }
             }
 
             Connections {
diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml
index 10080212c1f56..9ba808e5b7019 100644
--- a/src/gui/tray/TrayWindowHeader.qml
+++ b/src/gui/tray/TrayWindowHeader.qml
@@ -26,6 +26,8 @@ Rectangle {
     id: root
 
     readonly property alias currentAccountHeaderButton: currentAccountHeaderButton
+    readonly property alias openLocalFolderButton: openLocalFolderButton
+    readonly property alias appsMenu: appsMenu
 
     color: Style.currentUserHeaderColor