diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp
index 17d11e27ed0..f8f4147c225 100644
--- a/base/shell/explorer/taskswnd.cpp
+++ b/base/shell/explorer/taskswnd.cpp
@@ -1533,6 +1533,10 @@ public:
             break;
 
         case HSHELL_ACTIVATESHELLWINDOW:
+            ::SwitchToThisWindow(m_Tray->GetHWND(), TRUE);
+            ::SetForegroundWindow(m_Tray->GetHWND());
+            break;
+
         case HSHELL_LANGUAGE:
         case HSHELL_SYSMENU:
         case HSHELL_ENDTASK: