diff --git a/client/lobby/SelectionTab.cpp b/client/lobby/SelectionTab.cpp
index 051e37deb..6711419f0 100644
--- a/client/lobby/SelectionTab.cpp
+++ b/client/lobby/SelectionTab.cpp
@@ -677,7 +677,6 @@ void SelectionTab::selectFileName(std::string fname)
 	}
 
 	filter(-1);
-	selectAbs(-1);
 
 	for(int i = (int)curItems.size() - 1; i >= 0; i--)
 	{
@@ -689,6 +688,8 @@ void SelectionTab::selectFileName(std::string fname)
 		}
 	}
 
+	selectAbs(-1);
+
 	if(tabType == ESelectionScreen::saveGame && inputName->getText().empty())
 		inputName->setText("NEWGAME");
 }