diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c
index fb9f396d8ca..0a5c4f996a2 100644
--- a/win32ss/user/user32/controls/appswitch.c
+++ b/win32ss/user/user32/controls/appswitch.c
@@ -424,9 +424,16 @@ BOOL ProcessHotKey(VOID)
       windowCount=0;
       EnumChildWindowsZOrder(NULL, EnumerateCallback, 0);
 
-      if (windowCount < 2)
+      if (windowCount == 0)
          return FALSE;
 
+      if (windowCount == 1)
+      {
+         selectedWindow = 0;
+         CompleteSwitch(TRUE);
+         return TRUE;
+      }
+
       selectedWindow = 1;
 
       TRACE("[ATbot] HotKey Received. Opening window.\n");