diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 0b14623a87..597204f61c 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -25,6 +25,7 @@
 - Fix: [#25628] Availability of AVX2 and SSE4.1 is not detected correctly. 
 - Fix: [#25642] The selection marker for purchasing land rights is not drawn with the correct colours.
 - Fix: [#25646] It is possible to remove scenery and paths when setting staff patrol areas and purchasing land.
+- Fix: [#25660] After saving a track design with scenery, that ride’s entrances and exits are visible in ‘Highlight path issues’ mode.
 
 0.4.29 (2025-11-22)
 ------------------------------------------------------------------------
diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
index 7095b44aaf..ade9930b58 100644
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -118,8 +118,8 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3
     PROFILED_FUNCTION();
 
     auto rideIndex = entranceEl.GetRideIndex();
-    if ((gTrackDesignSaveMode || (session.ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
-        && (rideIndex != gTrackDesignSaveRideIndex))
+    if ((session.ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
+        || (gTrackDesignSaveMode && rideIndex != gTrackDesignSaveRideIndex))
     {
         return;
     }