diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp
index 71dab6674e..e244b73a73 100644
--- a/src/openrct2-ui/title/TitleSequencePlayer.cpp
+++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp
@@ -452,7 +452,7 @@ private:
     void PrepareParkForPlayback()
     {
         auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
-        windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
+        windowManager->SetMainView(gSavedView, gSavedViewZoom, gSavedViewRotation);
         reset_sprite_spatial_index();
         reset_all_sprite_quadrant_placements();
         auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES);
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index fe1cc1cfe3..a83f4bf990 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -425,7 +425,7 @@ namespace Editor
     static void FinaliseMainView()
     {
         auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
-        windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
+        windowManager->SetMainView(gSavedView, gSavedViewZoom, gSavedViewRotation);
 
         reset_all_sprite_quadrant_placements();
         scenery_set_default_placement_configuration();
diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp
index f07157b62e..8e9fb13844 100644
--- a/src/openrct2/Game.cpp
+++ b/src/openrct2/Game.cpp
@@ -553,7 +553,7 @@ void game_load_init()
     }
 
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
-    windowManager->SetMainView({ gSavedViewX, gSavedViewY }, gSavedViewZoom, gSavedViewRotation);
+    windowManager->SetMainView(gSavedView, gSavedViewZoom, gSavedViewRotation);
 
     if (network_get_mode() != NETWORK_MODE_CLIENT)
     {
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index c3691f6bd3..9e279deb8d 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -733,8 +733,8 @@ int32_t cmdline_for_screenshot(const char** argv, int32_t argc, ScreenshotOption
             }
             else
             {
-                viewport.view_x = gSavedViewX - (viewport.view_width / 2);
-                viewport.view_y = gSavedViewY - (viewport.view_height / 2);
+                viewport.view_x = gSavedView.x - (viewport.view_width / 2);
+                viewport.view_y = gSavedView.y - (viewport.view_height / 2);
                 viewport.zoom = gSavedViewZoom;
                 gCurrentRotation = gSavedViewRotation;
             }
diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index 0005f8dbb1..432d095409 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -1,4 +1,4 @@
-/*****************************************************************************
+/*****************************************************************************
  * Copyright (c) 2014-2019 OpenRCT2 developers
  *
  * For a complete list of all authors, please refer to contributors.md
@@ -45,8 +45,7 @@ rct_viewport* g_music_tracking_viewport;
 
 static std::unique_ptr<JobPool> _paintJobs;
 
-int16_t gSavedViewX;
-int16_t gSavedViewY;
+ScreenCoordsXY gSavedView;
 uint8_t gSavedViewZoom;
 uint8_t gSavedViewRotation;
 
@@ -1922,8 +1921,8 @@ void viewport_set_saved_view()
     {
         rct_viewport* viewport = w->viewport;
 
-        gSavedViewX = viewport->view_width / 2 + viewport->view_x;
-        gSavedViewY = viewport->view_height / 2 + viewport->view_y;
+        gSavedView = ScreenCoordsXY{ viewport->view_width / 2 + viewport->view_x,
+                                     viewport->view_height / 2 + viewport->view_y };
 
         gSavedViewZoom = viewport->zoom;
         gSavedViewRotation = get_current_rotation();
diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h
index 4577e4a1f6..ac5d438d22 100644
--- a/src/openrct2/interface/Viewport.h
+++ b/src/openrct2/interface/Viewport.h
@@ -121,8 +121,7 @@ extern uint8_t gShowConstuctionRightsRefCount;
 // rct2: 0x014234BC
 extern rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT];
 extern rct_viewport* g_music_tracking_viewport;
-extern int16_t gSavedViewX;
-extern int16_t gSavedViewY;
+extern ScreenCoordsXY gSavedView;
 extern uint8_t gSavedViewZoom;
 extern uint8_t gSavedViewRotation;
 
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index f65540f1a1..10ee725f87 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -2680,8 +2680,7 @@ private:
 
     void ImportSavedView()
     {
-        gSavedViewX = _s4.view_x;
-        gSavedViewY = _s4.view_y;
+        gSavedView = ScreenCoordsXY{ _s4.view_x, _s4.view_y };
         gSavedViewZoom = _s4.view_zoom;
         gSavedViewRotation = _s4.view_rotation;
     }
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index 29a75a4031..5d36db52ba 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -360,8 +360,8 @@ void S6Exporter::Export()
     this->ExportRides();
 
     _s6.saved_age = gSavedAge;
-    _s6.saved_view_x = gSavedViewX;
-    _s6.saved_view_y = gSavedViewY;
+    _s6.saved_view_x = gSavedView.x;
+    _s6.saved_view_y = gSavedView.y;
     _s6.saved_view_zoom = gSavedViewZoom;
     _s6.saved_view_rotation = gSavedViewRotation;
 
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index f91926322a..dfd6996d85 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -383,8 +383,7 @@ public:
         ImportRides();
 
         gSavedAge = _s6.saved_age;
-        gSavedViewX = _s6.saved_view_x;
-        gSavedViewY = _s6.saved_view_y;
+        gSavedView = ScreenCoordsXY{ _s6.saved_view_x, _s6.saved_view_y };
         gSavedViewZoom = _s6.saved_view_zoom;
         gSavedViewRotation = _s6.saved_view_rotation;