diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp
index a0415969bd..5303e19047 100644
--- a/src/vehiclelist.cpp
+++ b/src/vehiclelist.cpp
@@ -139,6 +139,18 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli
 			}
 			break;
 
+		case VL_GROUP_LIST:
+			if (vli.index != ALL_GROUP) {
+				FOR_ALL_VEHICLES(v) {
+					if (v->type == vli.vtype && v->IsPrimaryVehicle() &&
+							v->owner == vli.company && v->group_id == vli.index) {
+						*list->Append() = v;
+					}
+				}
+				break;
+			}
+			/* FALL THROUGH */
+
 		case VL_STANDARD:
 			FOR_ALL_VEHICLES(v) {
 				if (v->type == vli.vtype && v->owner == vli.company && v->IsPrimaryVehicle()) {
@@ -162,15 +174,6 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli
 			}
 			break;
 
-		case VL_GROUP_LIST:
-			FOR_ALL_VEHICLES(v) {
-				if (v->type == vli.vtype && v->IsPrimaryVehicle() &&
-						v->owner == vli.company && v->group_id == vli.index) {
-					*list->Append() = v;
-				}
-			}
-			break;
-
 		default: return false;
 	}