diff --git a/src/keypress.c b/src/keypress.c
index 9ff85e6f..0f4af5bd 100644
--- a/src/keypress.c
+++ b/src/keypress.c
@@ -22,7 +22,7 @@
 		(XTestFakeKeyEvent(display, \
 		                   XKeysymToKeycode(display, key), \
 		                   is_press, CurrentTime), \
-		 XSync(display, false))
+		 XFlush(display))
 	#define X_KEY_EVENT_WAIT(display, key, is_press) \
 		(X_KEY_EVENT(display, key, is_press))
 #endif
diff --git a/src/mouse.c b/src/mouse.c
index f7bb11d6..c795f79c 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -123,7 +123,7 @@ void moveMouse(MMSignedPoint point)
 	Display *display = XGetMainDisplay();
 	XWarpPointer(display, None, DefaultRootWindow(display),
 	             0, 0, 0, 0, point.x, point.y);
-	XSync(display, false);
+	XFlush(display);
 #elif defined(IS_WINDOWS)
 
 	if(vscreenWidth<0 || vscreenHeight<0)
@@ -208,7 +208,7 @@ void toggleMouse(bool down, MMMouseButton button)
 #elif defined(USE_X11)
 	Display *display = XGetMainDisplay();
 	XTestFakeButtonEvent(display, button, down ? True : False, CurrentTime);
-	XSync(display, false);
+	XFlush(display);
 #elif defined(IS_WINDOWS)
 	INPUT mouseInput;
 	mouseInput.type = INPUT_MOUSE;
@@ -321,7 +321,7 @@ void scrollMouse(int x, int y)
 		XTestFakeButtonEvent(display, ydir, 0, CurrentTime);
 	}
 
-	XSync(display, false);
+	XFlush(display);
 
 #elif defined(IS_WINDOWS)