diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index b4d40ba7b3..120703fa30 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -40,7 +40,6 @@
 #include <gal/opengl/opengl_gal.h>
 #include <gal/cairo/cairo_gal.h>
 
-#include <kiplatform/app.h>
 
 #include <tool/tool_dispatcher.h>
 #include <tool/tool_manager.h>
@@ -297,10 +296,6 @@ void EDA_DRAW_PANEL_GAL::onSize( wxSizeEvent& aEvent )
 
 void EDA_DRAW_PANEL_GAL::Refresh( bool aEraseBackground, const wxRect* aRect )
 {
-    // Call to ensure the refresh timer eventually fires during rapid mouse moves
-    // Required for win32
-    KIPLATFORM::APP::ForceTimerMessagesToBeCreatedIfNecessary();
-
     if( m_pendingRefresh )
         return;
 
diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index 57969af78e..8165b1e593 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -40,6 +40,7 @@
 
 #include <core/optional.h>
 #include <wx/stc/stc.h>
+#include <kiplatform/app.h>
 
 ///> Stores information about a mouse button state
 struct TOOL_DISPATCHER::BUTTON_STATE
@@ -417,6 +418,10 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
     bool            keyIsSpecial = false;  // True if the key is a special key code
     wxWindow*       focus = wxWindow::FindFocus();
 
+    // Required in win32 to ensure wxTimer events get scheduled in between other events
+    // Or else we may stall them out entirely and never get them during actions like rapid mouse moves
+    KIPLATFORM::APP::ForceTimerMessagesToBeCreatedIfNecessary();
+
     int type = aEvent.GetEventType();
 
     // Sometimes there is no window that has the focus (it happens when another PCB_BASE_FRAME