diff --git a/src/selection.cpp b/src/selection.cpp
index bf1124d92bc..e37d08c2611 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -474,6 +474,10 @@ void selNextSpecifiedBuilding(STRUCTURE_TYPE structType, bool jump)
 
 	for (STRUCTURE *psCurr : apsStructLists[selectedPlayer])
 	{
+		if (psResult)
+		{
+			break;
+		}
 		if (psCurr->pStructureType->type == structType && psCurr->status == SS_BUILT)
 		{
 			if (!psFirst)