diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 263ff012d47..49a2f14bef3 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -512,15 +512,14 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
 	power_manager = memnew(PowerX11);
 
 	XEvent xevent;
-	while (XCheckIfEvent(x11_display, &xevent, _check_window_events, NULL)) {
-		_window_changed(&xevent);
+	while (XPending(x11_display) > 0) {
+		XNextEvent(x11_display, &xevent);
+		if (xevent.type == ConfigureNotify) {
+			_window_changed(&xevent);
+		}
 	}
 }
 
-int OS_X11::_check_window_events(Display *display, XEvent *event, char *arg) {
-	if (event->type == ConfigureNotify) return 1;
-	return 0;
-}
 void OS_X11::xim_destroy_callback(::XIM im, ::XPointer client_data,
 		::XPointer call_data) {
 
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 84dff2e0899..244c69ee2ba 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -199,7 +199,6 @@ protected:
 	virtual void set_main_loop(MainLoop *p_main_loop);
 
 	void _window_changed(XEvent *xevent);
-	static int _check_window_events(Display *display, XEvent *xevent, char *arg);
 
 public:
 	virtual String get_name();