diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index bb364c11fa..a7bb3ebd73 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -1,6 +1,7 @@
 0.2.5+ (in development)
 ------------------------------------------------------------------------
 - Feature: [#11013] Ctrl+C copies input dialog text to clipboard.
+- Fix: [#475] Water sides drawn incorrectly (original bug).
 - Fix: [#6123, #7907, #9472, #11028] Cannot build some track designs with 4 stations (original bug).
 - Fix: [#7094] Back wall edge texture in water missing.
 - Fix: [#11027] Third color on walls becomes black when saving.
diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index 121d3f3a3b..5efc35b703 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -1300,14 +1300,14 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
                 const uint32_t edgeStyle = tileElement->AsSurface()->GetEdgeStyle();
                 // end new code
 
-                viewport_surface_draw_water_side_top(
-                    session, EDGE_TOPLEFT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[3]);
-                viewport_surface_draw_water_side_top(
-                    session, EDGE_TOPRIGHT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[4]);
                 viewport_surface_draw_water_side_bottom(
                     session, EDGE_BOTTOMLEFT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[1]);
                 viewport_surface_draw_water_side_bottom(
                     session, EDGE_BOTTOMRIGHT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[2]);
+                viewport_surface_draw_water_side_top(
+                    session, EDGE_TOPLEFT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[3]);
+                viewport_surface_draw_water_side_top(
+                    session, EDGE_TOPRIGHT, waterHeight, edgeStyle, tileDescriptors[0], tileDescriptors[4]);
             }
         }
     }