diff --git a/Userland/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
index 40f199b6a8..b83461678c 100644
--- a/Userland/Services/WindowServer/ClientConnection.cpp
+++ b/Userland/Services/WindowServer/ClientConnection.cpp
@@ -954,8 +954,11 @@ void ClientConnection::set_unresponsive(bool unresponsive)
     for (auto& it : m_windows) {
         auto& window = *it.value;
         window.invalidate();
-        if (unresponsive)
-            window.set_cursor(WindowManager::the().wait_cursor());
+        if (unresponsive) {
+            window.set_cursor_override(WindowManager::the().wait_cursor());
+        } else {
+            window.remove_cursor_override();
+        }
     }
     Compositor::the().invalidate_cursor();
 }
diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h
index 5ed3aed27e..977b9190a4 100644
--- a/Userland/Services/WindowServer/Window.h
+++ b/Userland/Services/WindowServer/Window.h
@@ -257,8 +257,10 @@ public:
 
     void set_default_icon();
 
-    const Cursor* cursor() const { return m_cursor.ptr(); }
+    const Cursor* cursor() const { return (m_cursor_override ? m_cursor_override : m_cursor).ptr(); }
     void set_cursor(RefPtr<Cursor> cursor) { m_cursor = move(cursor); }
+    void set_cursor_override(RefPtr<Cursor> cursor) { m_cursor_override = move(cursor); }
+    void remove_cursor_override() { m_cursor_override = nullptr; }
 
     void request_update(const Gfx::IntRect&, bool ignore_occlusion = false);
     Gfx::DisjointRectSet take_pending_paint_rects() { return move(m_pending_paint_rects); }
@@ -384,6 +386,7 @@ private:
     Gfx::IntSize m_minimum_size { 1, 1 };
     NonnullRefPtr<Gfx::Bitmap> m_icon;
     RefPtr<Cursor> m_cursor;
+    RefPtr<Cursor> m_cursor_override;
     WindowFrame m_frame;
     unsigned m_wm_event_mask { 0 };
     Gfx::DisjointRectSet m_pending_paint_rects;