--- a/station_gui.c	Thu Dec 07 22:31:20 2006 +0000
+++ b/station_gui.c	Fri Dec 08 02:25:04 2006 +0000
@@ -35,7 +35,6 @@
 	STATIONLIST_WIDGET_SORTCRITERIA,
 	STATIONLIST_WIDGET_SORTDROPBTN,
 	CARGO_ALL_SELECTED = 0x1FFF,
-	CARGO_NONE_SELECTED = 0x1000,
 };
 
 typedef int CDECL StationSortListingTypeFunction(const void*, const void*);
@@ -277,7 +276,7 @@
 		}
 		SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_FACILALL, facilities == (FACIL_TRAIN | FACIL_TRUCK_STOP | FACIL_BUS_STOP | FACIL_AIRPORT | FACIL_DOCK));
 		SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_CARGOALL, cargo_filter == CARGO_ALL_SELECTED);
-		SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_NOCARGOWAITING, cargo_filter == CARGO_NONE_SELECTED);
+		SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_NOCARGOWAITING, HASBIT(cargo_filter, STATIONLIST_WIDGET_NOCARGOWAITING - NUM_CARGO));
 
 		sl->sort_list = NULL;
 		sl->flags = SL_REBUILD;
@@ -424,7 +423,7 @@
 			for (i = 0; i < NUM_CARGO; i++) {
 				LowerWindowWidget(w, i + STATIONLIST_WIDGET_CARGOSTART);
 			}
-			RaiseWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING);
+			LowerWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING);
 			LowerWindowWidget(w, STATIONLIST_WIDGET_CARGOALL);
 
 			cargo_filter = CARGO_ALL_SELECTED;