diff --git a/src/wl_window.c b/src/wl_window.c
index 497b00dd..997baa18 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -1860,6 +1860,9 @@ const char* _glfwPlatformGetClipboardString(void)
         return NULL;
     }
 
+    if (_glfw.wl.dataSource)
+        return _glfw.wl.clipboardSendString;
+
     ret = pipe2(fds, O_CLOEXEC);
     if (ret < 0)
     {
@@ -1870,10 +1873,9 @@ const char* _glfwPlatformGetClipboardString(void)
     }
 
     wl_data_offer_receive(_glfw.wl.dataOffer, "text/plain;charset=utf-8", fds[1]);
-    close(fds[1]);
 
-    // XXX: this is a huge hack, this function shouldn’t be synchronous!
-    handleEvents(NULL);
+    flushDisplay();
+    close(fds[1]);
 
     for (;;)
     {