diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index 2e817d8f9e..b7428a9c6d 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -2278,11 +2278,9 @@ private:
             viewport_set_visibility(1);
         }
 
-        if ((_currentTrackCurve >= (TrackElemType::LeftHalfBankedHelixUpSmall | RideConstructionSpecialPieceSelected)
-             && _currentTrackCurve <= (TrackElemType::RightHalfBankedHelixDownLarge | RideConstructionSpecialPieceSelected))
-            || (_currentTrackCurve >= (TrackElemType::LeftQuarterBankedHelixLargeUp | RideConstructionSpecialPieceSelected)
-                && _currentTrackCurve <= (TrackElemType::RightQuarterHelixLargeDown | RideConstructionSpecialPieceSelected))
-            || (_currentTrackSlopeEnd != TRACK_SLOPE_NONE))
+        const bool helixSelected = (_currentTrackCurve & RideConstructionSpecialPieceSelected)
+            && TrackTypeIsHelix(_currentTrackCurve & ~RideConstructionSpecialPieceSelected);
+        if (helixSelected || (_currentTrackSlopeEnd != TRACK_SLOPE_NONE))
         {
             viewport_set_visibility(2);
         }