diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
index 3c33599e9ce..5e6b187e089 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
@@ -395,7 +395,7 @@ void PopupHostGameInit( WindowLayout *layout, void *userData )
   GadgetCheckBoxSetChecked( checkBoxLimitArmies, usingStats? FALSE : customPref.getFactionsLimited() );
 #endif
 
-	TheWindowManager->winSetFocus( parentPopup );
+	TheWindowManager->winSetFocus(textEntryGameName);
 	TheWindowManager->winSetModal( parentPopup );
 
 #if defined(GENERALS_ONLINE)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
index 0a33d8ef15c..6da24515013 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
@@ -112,7 +112,7 @@ void PopupJoinGameInit( WindowLayout *layout, void *userData )
 	UnicodeString lobbyName(from_utf8(lobbyTryingToJoin.name).c_str());
 	GadgetStaticTextSetText(staticTextGameName, lobbyName);
 
-	TheWindowManager->winSetFocus( parentPopup );
+	TheWindowManager->winSetFocus(textEntryGamePassword);
 	TheWindowManager->winSetModal( parentPopup );
 
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
index 1a0d20f5e78..2a5ae64faaa 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
@@ -1318,6 +1318,7 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
                                 pSocialInterface->ClearUnreadChatMessagesForUser(profileID);
 								updateBuddyInfo(true, true); // use cache
                             }
+							TheWindowManager->winSetFocus(buddyControls.textEntryEdit);
 						}
 					}
 				}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
index bcd95eee9c4..8bc7130bda8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
@@ -2123,9 +2123,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 	enterTime = timeGetTime();
 
 	// Set Keyboard to chat entry
-	TheWindowManager->winSetFocus( textEntryChat );
 	raiseMessageBoxes = true;
 	TheTransitionHandler->setGroup("GameSpyGameOptionsMenuFade");
+	TheWindowManager->winSetFocus(textEntryChat);
 
 #if defined(GENERALS_ONLINE)
 // NGMP: Did we just enter a lobby with modified camera height?
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
index 1eb76f6f974..f542c65080d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
@@ -1383,8 +1383,6 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	}
 	*/
 
-	// Set Keyboard to chat window
-	TheWindowManager->winSetFocus( textEntryChat );
 	raiseMessageBoxes = true;
 
 	TheLobbyQueuedUTMs.clear();
@@ -1733,6 +1731,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 		{
 			TheTransitionHandler->remove("MainMenuDefaultMenuLogoFade");
 			TheTransitionHandler->setGroup("WOLCustomLobbyFade");
+			TheWindowManager->winSetFocus(textEntryChat);
 			initialGadgetDelay = 2;
 			justEntered = FALSE;
 		}