diff --git a/client/lobby/CSelectionBase.cpp b/client/lobby/CSelectionBase.cpp
index 357bff3a8..d8367bef9 100644
--- a/client/lobby/CSelectionBase.cpp
+++ b/client/lobby/CSelectionBase.cpp
@@ -113,9 +113,11 @@ void CSelectionBase::toggleTab(std::shared_ptr<CIntObject> tab)
 	}
 
 	if(tabSel->showRandom)
+	{
 		tabSel->curFolder = "";
-	tabSel->showRandom = false;
-	tabSel->filter(0, true);
+		tabSel->filter(0, true);
+		tabSel->showRandom = false;
+	}
 
 	GH.windows().totalRedraw();
 }