diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index 5952e1d7..2f5b7b33 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -1243,6 +1243,7 @@ bool menukey(int code, bool isdown, int unicode, SDLMod mod)
                 if(!curmenu->items.inrange(menusel)) return false;
                 mitem &m = *curmenu->items[menusel];
                 m.key(code, isdown, unicode);
+                if(code == SDLK_HOME && m.mitemtype != mitem::TYPE_TEXTINPUT) menuselect(curmenu, (menusel = 0));
                 return !curmenu->forwardkeys;
             }
         }
diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp
index 4caae9f6..432a2ea6 100644
--- a/source/src/serverbrowser.cpp
+++ b/source/src/serverbrowser.cpp
@@ -1209,10 +1209,6 @@ bool serverskey(void *menu, int code, bool isdown, int unicode)
     }
     switch(code)
     {
-        case SDLK_HOME:
-            if(menu) ((gmenu *)menu)->menusel = 0;
-            return true;
-
         case SDLK_LEFT:
             serversort = (serversort+NUMSERVSORT-1) % NUMSERVSORT;
             return true;
@@ -1276,10 +1272,6 @@ bool serverinfokey(void *menu, int code, bool isdown, int unicode)
     if(!isdown) return false;
     switch(code)
     {
-        case SDLK_HOME:
-            if(menu) ((gmenu *)menu)->menusel = 0;
-            return true;
-
         case SDLK_F5:
             if(lastselectedserver) lastselectedserver->getinfo = EXTPING_SERVERINFO;
             pinglastselected = true;