diff --git a/lib/platform/CXWindowsSecondaryScreen.cpp b/lib/platform/CXWindowsSecondaryScreen.cpp
index 4609068e0..33fa13598 100644
--- a/lib/platform/CXWindowsSecondaryScreen.cpp
+++ b/lib/platform/CXWindowsSecondaryScreen.cpp
@@ -251,6 +251,12 @@ CXWindowsSecondaryScreen::keyUp(KeyID key,
 	m_fakeKeys[keycode] = false;
 }
 
+void
+CXWindowsSecondaryScreen::flush(Display* display) const
+{
+	XFlush(display);
+}
+
 void
 CXWindowsSecondaryScreen::mouseDown(ButtonID button)
 {
@@ -258,7 +264,7 @@ CXWindowsSecondaryScreen::mouseDown(ButtonID button)
 	if (xButton != 0) {
 		CDisplayLock display(m_screen);
 		XTestFakeButtonEvent(display, xButton, True, CurrentTime);
-		XSync(display, False);
+		flush(display);
 	}
 }
 
@@ -269,7 +275,7 @@ CXWindowsSecondaryScreen::mouseUp(ButtonID button)
 	if (xButton != 0) {
 		CDisplayLock display(m_screen);
 		XTestFakeButtonEvent(display, xButton, False, CurrentTime);
-		XSync(display, False);
+		flush(display);
 	}
 }
 
@@ -300,7 +306,7 @@ CXWindowsSecondaryScreen::mouseWheel(SInt32 delta)
 		XTestFakeButtonEvent(display, xButton, True, CurrentTime);
 		XTestFakeButtonEvent(display, xButton, False, CurrentTime);
 	}
-	XSync(display, False);
+	flush(display);
 }
 
 void
@@ -526,7 +532,7 @@ CXWindowsSecondaryScreen::destroyWindow()
 			XTestGrabControl(display, False);
 
 			// update
-			XSync(display, False);
+			flush(display);
 		}
 	}
 
@@ -583,7 +589,7 @@ CXWindowsSecondaryScreen::warpCursor(SInt32 x, SInt32 y)
 		XTestFakeMotionEvent(display, DefaultScreen(pDisplay),
 							x, y, CurrentTime);
 	}
-	XSync(display, False);
+	flush(display);
 }
 
 void
@@ -1192,7 +1198,7 @@ CXWindowsSecondaryScreen::doKeystrokes(const Keystrokes& keys, SInt32 count)
 	}
 
 	// update
-	XSync(display, False);
+	flush(display);
 }
 
 CXWindowsSecondaryScreen::ModifierMask
diff --git a/lib/platform/CXWindowsSecondaryScreen.h b/lib/platform/CXWindowsSecondaryScreen.h
index 811aaa875..c2de53ee7 100644
--- a/lib/platform/CXWindowsSecondaryScreen.h
+++ b/lib/platform/CXWindowsSecondaryScreen.h
@@ -113,6 +113,8 @@ private:
 	typedef std::map<KeySym, KeySyms> KeySymsMap;
 	typedef std::map<KeyButton, KeyCode> ServerKeyMap;
 
+	void				flush(Display*) const;
+
 	unsigned int		mapButton(ButtonID button) const;
 
 	ModifierMask		mapKey(Keystrokes&, KeyCode&, KeyID,