diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp
index fb567b13a2..a8a0949a4e 100644
--- a/src/openrct2-ui/WindowManager.cpp
+++ b/src/openrct2-ui/WindowManager.cpp
@@ -263,6 +263,11 @@ public:
         }
     }
 
+    void UpdateMapTooltip() override
+    {
+        window_map_tooltip_update_visibility();
+    }
+
     void HandleKeyboard(bool isTitle) override
     {
         input_handle_keyboard(isTitle);
diff --git a/src/openrct2/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp
similarity index 94%
rename from src/openrct2/windows/MapTooltip.cpp
rename to src/openrct2-ui/windows/MapTooltip.cpp
index 781497e42b..ac85a69585 100644
--- a/src/openrct2/windows/MapTooltip.cpp
+++ b/src/openrct2-ui/windows/MapTooltip.cpp
@@ -14,12 +14,13 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../Context.h"
+#include <openrct2-ui/windows/Window.h>
 
-#include "../input.h"
-#include "../interface/themes.h"
-#include "../interface/widget.h"
-#include "../localisation/localisation.h"
+#include <openrct2/Context.h>
+#include <openrct2/input.h>
+#include <openrct2/interface/themes.h>
+#include <openrct2/interface/widget.h>
+#include <openrct2/localisation/localisation.h>
 
 static rct_widget window_map_tooltip_widgets[] = {
     { WWT_IMGBTN, 0, 0, 199, 0, 29, 0xFFFFFFFF, STR_NONE },
diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h
index ec3e8959cd..8b5f06eece 100644
--- a/src/openrct2-ui/windows/Window.h
+++ b/src/openrct2-ui/windows/Window.h
@@ -116,3 +116,5 @@ void window_ride_measurements_design_cancel();
 // rct2: 0x00F635EE
 extern ride_list_item _window_track_list_item;
 rct_window * window_track_list_open(ride_list_item item);
+
+void window_map_tooltip_update_visibility();
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 96687e54ea..e422a58cda 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -1039,6 +1039,12 @@ extern "C"
         return windowManager->ShowError(title, message);
     }
 
+void context_update_map_tooltip()
+{
+    auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
+    windowManager->UpdateMapTooltip();
+}
+
     void context_input_handle_keyboard(bool isTitle)
     {
         auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h
index 5f492c285a..38321a6a06 100644
--- a/src/openrct2/Context.h
+++ b/src/openrct2/Context.h
@@ -219,6 +219,7 @@ extern "C"
     rct_window * context_show_error(rct_string_id title, rct_string_id message);
     rct_window * context_open_intent(Intent * intent);
     void context_broadcast_intent(Intent * intent);
+    void context_update_map_tooltip();
     void context_input_handle_keyboard(bool isTitle);
     bool context_read_bmp(void * * outPixels, uint32 * outWidth, uint32 * outHeight, const utf8 * path);
     void context_quit();
diff --git a/src/openrct2/game.c b/src/openrct2/game.c
index f82f40e178..f685a794b3 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/game.c
@@ -368,7 +368,7 @@ void game_update()
             gWindowMapFlashingFlags |= (1 << 3);
         gWindowMapFlashingFlags &= ~(1 << 2);
 
-        window_map_tooltip_update_visibility();
+        context_update_map_tooltip();
 
         // Input
         gUnk141F568 = gUnk13CA740;
diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h
index a9038cd606..a2a633987b 100644
--- a/src/openrct2/interface/window.h
+++ b/src/openrct2/interface/window.h
@@ -745,8 +745,6 @@ void window_bubble_list_item(rct_window* w, sint32 item_position);
 
 void window_align_tabs( rct_window *w, rct_widgetindex start_tab_id, rct_widgetindex end_tab_id );
 
-void window_map_tooltip_update_visibility();
-
 void window_staff_list_init_vars();
 
 void game_command_callback_pickup_guest(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp);
diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp
index b4cd5e3b49..ff8d2be779 100644
--- a/src/openrct2/title/TitleScreen.cpp
+++ b/src/openrct2/title/TitleScreen.cpp
@@ -172,7 +172,7 @@ void TitleScreen::Update()
 
     input_set_flag(INPUT_FLAG_VIEWPORT_SCROLLING, false);
 
-    window_map_tooltip_update_visibility();
+    context_update_map_tooltip();
     window_dispatch_update_all();
 
     gSavedAge++;
diff --git a/src/openrct2/ui/DummyWindowManager.cpp b/src/openrct2/ui/DummyWindowManager.cpp
index 09f3d42252..2820989b08 100644
--- a/src/openrct2/ui/DummyWindowManager.cpp
+++ b/src/openrct2/ui/DummyWindowManager.cpp
@@ -27,6 +27,7 @@ namespace OpenRCT2 { namespace Ui
         rct_window * ShowError(rct_string_id title, rct_string_id message) override { return nullptr; }
         rct_window * OpenIntent(Intent * intent) override { return nullptr; };
         void BroadcastIntent(Intent * intent) override { }
+        void UpdateMapTooltip() override { }
         void HandleKeyboard(bool isTitle) override { }
         std::string GetKeyboardShortcutString(sint32 shortcut) override { return std::string(); }
     };
diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h
index 86f070f9be..0860aa00fe 100644
--- a/src/openrct2/ui/WindowManager.h
+++ b/src/openrct2/ui/WindowManager.h
@@ -41,7 +41,7 @@ namespace OpenRCT2
             virtual rct_window * OpenIntent(Intent * intent) abstract;
             virtual void BroadcastIntent(Intent * intent) abstract;
             virtual rct_window * ShowError(rct_string_id title, rct_string_id message) abstract;
-
+            virtual void UpdateMapTooltip() abstract;
             virtual void HandleKeyboard(bool isTitle) abstract;
             virtual std::string GetKeyboardShortcutString(sint32 shortcut) abstract;
         };