diff --git a/src/interface/viewport_interaction.c b/src/interface/viewport_interaction.c
index c9f96379a4..d16c682346 100644
--- a/src/interface/viewport_interaction.c
+++ b/src/interface/viewport_interaction.c
@@ -272,9 +272,11 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info
 		return info->type;
 	}
 
-	if ((gInputFlags & INPUT_FLAG_6) && (gInputFlags & INPUT_FLAG_TOOL_ACTIVE))
-		if (window_find_by_class(WC_RIDE_CONSTRUCTION) == NULL && window_find_by_class(WC_FOOTPATH) == NULL)
+	if (!(gInputFlags & INPUT_FLAG_6) || !(gInputFlags & INPUT_FLAG_TOOL_ACTIVE)) {
+		if (window_find_by_class(WC_RIDE_CONSTRUCTION) == NULL && window_find_by_class(WC_FOOTPATH) == NULL) {
 			return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
+		}
+	}
 
 	switch (info->type) {
 	case VIEWPORT_INTERACTION_ITEM_SCENERY: