diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index 4280163ef..1ad97b2f5 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -144,6 +144,8 @@ meta_x11_display_dispose (GObject *object)
   if (x11_display->frames_client)
     {
       g_subprocess_send_signal (x11_display->frames_client, SIGTERM);
+      if (x11_display->display->closing)
+        g_subprocess_wait (x11_display->frames_client, NULL, NULL);
       g_clear_object (&x11_display->frames_client);
     }