diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml
index 1f84e1f6..6d914e85 100644
--- a/Modules/Bar/Widgets/Tray.qml
+++ b/Modules/Bar/Widgets/Tray.qml
@@ -343,10 +343,9 @@ Rectangle {
                              return
                            }
 
-                           // Close the drawer if it's open (when opening menu for pinned item)
-                           const drawerPanel = PanelService.getPanel("trayDrawerPanel", screen)
-                           if (drawerPanel && drawerPanel.visible) {
-                             drawerPanel.close()
+                           // Close any opened panel
+                           if ((PanelService.openedPanel !== null) && !PanelService.openedPanel.isClosing) {
+                             PanelService.openedPanel.close()
                            }
 
                            if (modelData.hasMenu && modelData.menu && trayMenuWindow && trayMenu && trayMenu.item) {