diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index 7a77b30146..19a4327532 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -86,7 +86,7 @@ struct GoalListWindow : public Window {
 		if (y < 0) return;
 
 		for (const Goal *s : Goal::Iterate()) {
-			if (s->company == this->window_number) {
+			if (s->company == this->window_number && s->company != INVALID_COMPANY) {
 				y--;
 				if (y == 0) {
 					this->HandleClick(s);