--- a/src/subsidy_gui.cpp	Mon Jun 02 23:01:57 2008 +0000
+++ b/src/subsidy_gui.cpp	Tue Jun 03 00:23:54 2008 +0000
@@ -37,23 +37,29 @@
 		for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) {
 			if (s->cargo_type != CT_INVALID && s->age < 12) {
 				y -= 10;
-				if (y < 0) this->HandleClick(s);
+				if (y < 0) {
+					this->HandleClick(s);
+					return;
+				}
 				num++;
 			}
 		}
 
 		if (num == 0) {
-			y -= 10;
+			y -= 10; /* "None" */
 			if (y < 0) return;
 		}
 
-		y -= 11;
+		y -= 11; /* "Services already subsidised:" */
 		if (y < 0) return;
 
 		for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) {
 			if (s->cargo_type != CT_INVALID && s->age >= 12) {
 				y -= 10;
-				if (y < 0) this->HandleClick(s);
+				if (y < 0) {
+					this->HandleClick(s);
+					return;
+				}
 			}
 		}
 	}