diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua
index b752add6e..ee3316117 100644
--- a/builtin/mainmenu.lua
+++ b/builtin/mainmenu.lua
@@ -642,6 +642,11 @@ function tabbuilder.handle_multiplayer_buttons(fields)
 				gamedata.serverdescription = menu.favorites[event.index].description
 			end
 			
+			if menu.favorites ~= nil then
+				gamedata.servername = menu.favorites[event.index].name
+				gamedata.serverdescription = menu.favorites[event.index].description
+			end
+			
 			if gamedata.address ~= nil and
 				gamedata.port ~= nil then