diff --git a/Services/WindowServer/ClientConnection.cpp b/Services/WindowServer/ClientConnection.cpp
index 2eb3b5aaa2..c1da4bc0cb 100644
--- a/Services/WindowServer/ClientConnection.cpp
+++ b/Services/WindowServer/ClientConnection.cpp
@@ -842,8 +842,12 @@ void ClientConnection::set_unresponsive(bool unresponsive)
         return;
     m_unresponsive = unresponsive;
     for (auto& it : m_windows) {
-        it.value->invalidate();
+        auto& window = *it.value;
+        window.invalidate();
+        if (unresponsive)
+            window.set_override_cursor(WindowManager::the().wait_cursor());
     }
+    Compositor::the().invalidate_cursor();
 }
 
 void ClientConnection::may_have_become_unresponsive()