diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index 362d52f17a..dff53e6db7 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -72,7 +72,7 @@ uint8_t gCurrentRotation;
 
 static uint32_t _currentImageType;
 InteractionInfo::InteractionInfo(const PaintStruct* ps)
-    : Loc(ps->map_x, ps->map_y)
+    : Loc(ps->MapPos)
     , Element(ps->Element)
     , Entity(ps->Entity)
     , SpriteType(ps->InteractionItem)
diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp
index 67a2e4cf4a..8937746106 100644
--- a/src/openrct2/paint/Paint.cpp
+++ b/src/openrct2/paint/Paint.cpp
@@ -189,8 +189,7 @@ static PaintStruct* CreateNormalPaintStruct(
     ps->Attached = nullptr;
     ps->Children = nullptr;
     ps->InteractionItem = session.InteractionType;
-    ps->map_x = session.MapPosition.x;
-    ps->map_y = session.MapPosition.y;
+    ps->MapPos = session.MapPosition;
     ps->Element = session.CurrentlyDrawnTileElement;
     ps->Entity = session.CurrentlyDrawnEntity;
 
diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h
index 93b0c07074..f9bb7c5082 100644
--- a/src/openrct2/paint/Paint.h
+++ b/src/openrct2/paint/Paint.h
@@ -57,8 +57,7 @@ struct PaintStruct
     ImageId image_id;
     int32_t x;
     int32_t y;
-    int32_t map_x;
-    int32_t map_y;
+    CoordsXY MapPos;
     uint16_t QuadrantIndex;
     uint8_t SortFlags;
     ViewportInteractionItem InteractionItem;