diff --git a/UI/AdhocServerScreen.cpp b/UI/AdhocServerScreen.cpp
index 040d77d9d0..6bbf492d05 100644
--- a/UI/AdhocServerScreen.cpp
+++ b/UI/AdhocServerScreen.cpp
@@ -726,7 +726,8 @@ void AdhocServerScreen::CreatePopupContents(UI::ViewGroup *parent) {
 
 	CollapsibleSection *publicSection = innerView->Add(new CollapsibleSection(n->T("Public server list"), new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
 	for (const auto &entry : entries) {
-		if (entry.hidden)
+		// Show even hidden entries, as long as they are chosen currently.
+		if (entry.hidden && entry.host != g_Config.sProAdhocServer)
 			continue;
 		AddButtonFromEntry(publicSection, entry, false);
 	}