--- a/src/viewport.cpp	Thu Jul 31 05:47:29 2008 +0000
+++ b/src/viewport.cpp	Thu Jul 31 13:28:23 2008 +0000
@@ -1805,7 +1805,7 @@
 {
 	const Station *st;
 
-	if (!HasBit(_display_opt, DO_SHOW_STATION_NAMES)) return false;
+	if (!HasBit(_display_opt, DO_SHOW_STATION_NAMES) || IsInvisibilitySet(TO_SIGNS)) return false;
 
 	switch (vp->zoom) {
 		case ZOOM_LVL_NORMAL:
@@ -1922,7 +1922,7 @@
 {
 	const Waypoint *wp;
 
-	if (!HasBit(_display_opt, DO_WAYPOINTS)) return false;
+	if (!HasBit(_display_opt, DO_WAYPOINTS) || IsInvisibilitySet(TO_SIGNS)) return false;
 
 	switch (vp->zoom) {
 		case ZOOM_LVL_NORMAL: