diff --git a/src/viewport.cpp b/src/viewport.cpp
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1229,7 +1229,7 @@ static void ViewportAddWaypoints(DrawPix
 	const Waypoint *wp;
 	int left, top, right, bottom;
 
-	if (!HasBit(_display_opt, DO_WAYPOINTS))
+	if (!HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES))
 		return;
 
 	left = dpi->left;
@@ -2016,7 +2016,7 @@ static bool CheckClickOnWaypoint(const V
 {
 	const Waypoint *wp;
 
-	if (!HasBit(_display_opt, DO_WAYPOINTS) || IsInvisibilitySet(TO_SIGNS)) return false;
+	if (!HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES) || IsInvisibilitySet(TO_SIGNS)) return false;
 
 	switch (vp->zoom) {
 		case ZOOM_LVL_NORMAL: