diff --git a/client/lobby/SelectionTab.cpp b/client/lobby/SelectionTab.cpp
index e22c936d3..34375db26 100644
--- a/client/lobby/SelectionTab.cpp
+++ b/client/lobby/SelectionTab.cpp
@@ -345,7 +345,10 @@ void SelectionTab::clickDouble(const Point & cursorPosition)
 		return;
 
 	if(itemIndex >= 0 && curItems[itemIndex]->isFolder)
+	{
+		select(position);
 		return;
+	}
 
 	if(getLine() != -1) //double clicked scenarios list
 	{
@@ -370,6 +373,8 @@ void SelectionTab::showPopupWindow(const Point & cursorPosition)
 
 		GH.windows().createAndPushWindow<CMapInfoTooltipBox>(text, ResourcePath(curItems[py]->fileURI), tabType);
 	}
+	else
+		CRClickPopup::createAndPush(curItems[py]->folderName);
 }
 
 auto SelectionTab::checkSubfolder(std::string path)