diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 5be0aa2d96..1332d4c83b 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -3,6 +3,7 @@
 - Fix: [#14312] Research ride type message incorrect.
 - Fix: [#17853] Invention name tears while being dragged.
 - Fix: [#18064] Unable to dismiss notification messages.
+- Fix: [#18070] Underground entrance/exit shows through terrain walls (original bug).
 - Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
 - Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
 - Fix: [#18257] Guests ‘waiting’ on extended railway crossings.
diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
index ca22edc164..6c9d8e0ff4 100644
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -162,7 +162,7 @@ static void PaintRideEntranceExit(paint_session& session, uint8_t direction, int
     CoordsXYZ boundBoxLength = {
         (direction & 1) ? 2 : 28,
         (direction & 1) ? 28 : 2,
-        isExit ? 35 : 51,
+        isExit ? 32 : 48,
     };
 
     // Back