diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 183a099a63e..6dff80de38f 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1372,12 +1372,10 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)

 void GHOST_SystemWin32::driveTrackpad()
 {
-  if (m_multitouchGestures) {
-    GHOST_WindowWin32 *active_window = static_cast<GHOST_WindowWin32 *>(
-        getWindowManager()->getActiveWindow());
-    if (active_window) {
-      active_window->updateDirectManipulation();
-    }
+  GHOST_WindowWin32 *active_window = static_cast<GHOST_WindowWin32 *>(
+      getWindowManager()->getActiveWindow());
+  if (active_window) {
+    active_window->updateDirectManipulation();
   }
 }

@@ -2095,7 +2093,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
           /* The DM_POINTERHITTEST message is sent to a window, when pointer input is first
            * detected, in order to determine the most probable input target for Direct
            * Manipulation. */
-          window->onPointerHitTest(wParam);
+          if (system->m_multitouchGestures) {
+            window->onPointerHitTest(wParam);
+          }
           break;
         }
       }