diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index 769c0dbba3..1bc518d602 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/Servers/WindowServer/WSClientConnection.cpp
@@ -8,6 +8,7 @@
 #include <WindowServer/WSAPITypes.h>
 #include <WindowServer/WSClipboard.h>
 #include <WindowServer/WSScreen.h>
+#include <WindowServer/WSWindowSwitcher.h>
 #include <SharedBuffer.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
@@ -550,6 +551,8 @@ void WSClientConnection::handle_request(const WSAPIDidFinishPaintingNotification
     auto& window = *(*it).value;
     for (auto& rect : request.rects())
         WSWindowManager::the().invalidate(window, rect);
+
+    WSWindowSwitcher::the().refresh_if_needed();
 }
 
 void WSClientConnection::handle_request(const WSAPIGetWindowBackingStoreRequest& request)
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index 1ed206d9d8..ed0e5dd428 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/Servers/WindowServer/WSWindowSwitcher.cpp
@@ -2,9 +2,19 @@
 #include <WindowServer/WSWindowManager.h>
 #include <WindowServer/WSEvent.h>
 #include <SharedGraphics/Font.h>
+#include <SharedGraphics/StylePainter.h>
+
+static WSWindowSwitcher* s_the;
+
+WSWindowSwitcher& WSWindowSwitcher::the()
+{
+    ASSERT(s_the);
+    return *s_the;
+}
 
 WSWindowSwitcher::WSWindowSwitcher()
 {
+    s_the = this;
 }
 
 WSWindowSwitcher::~WSWindowSwitcher()
@@ -80,8 +90,15 @@ void WSWindowSwitcher::draw()
             rect_text_color = Color::MidGray;
         }
         item_rect.shrink(item_padding(), 0);
-        painter.blit(item_rect.location().translated(0, (item_rect.height() - window.icon().height()) / 2), window.icon(), window.icon().rect());
-        painter.draw_text(item_rect.translated(window.icon().width() + 4, 0), window.title(), WSWindowManager::the().window_title_font(), TextAlignment::CenterLeft, text_color);
+        Rect thumbnail_rect = { item_rect.location().translated(0, 5), { thumbnail_width(), thumbnail_height() } };
+        if (window.backing_store()) {
+            painter.draw_scaled_bitmap(thumbnail_rect, *window.backing_store(), window.backing_store()->rect());
+            StylePainter::paint_frame(painter, thumbnail_rect.inflated(4, 4), FrameShape::Container, FrameShadow::Sunken, 2);
+        }
+        Rect icon_rect = { thumbnail_rect.bottom_right().translated(-window.icon().width(), -window.icon().height()), { window.icon().width(), window.icon().height() } };
+        painter.fill_rect(icon_rect, Color::LightGray);
+        painter.blit(icon_rect.location(), window.icon(), window.icon().rect());
+        painter.draw_text(item_rect.translated(thumbnail_width() + 12, 0), window.title(), WSWindowManager::the().window_title_font(), TextAlignment::CenterLeft, text_color);
         painter.draw_text(item_rect, window.rect().to_string(), TextAlignment::CenterRight, rect_text_color);
     }
 }
@@ -108,7 +125,7 @@ void WSWindowSwitcher::refresh()
         return;
     }
     int space_for_window_rect = 180;
-    m_rect.set_width(longest_title_width + space_for_window_rect + padding() * 2 + item_padding() * 2);
+    m_rect.set_width(thumbnail_width() + longest_title_width + space_for_window_rect + padding() * 2 + item_padding() * 2);
     m_rect.set_height(window_count * item_height() + padding() * 2);
     m_rect.center_within(WSWindowManager::the().m_screen_rect);
     if (!m_switcher_window)
@@ -116,3 +133,11 @@ void WSWindowSwitcher::refresh()
     m_switcher_window->set_rect(m_rect);
     draw();
 }
+
+void WSWindowSwitcher::refresh_if_needed()
+{
+    if (m_visible) {
+        refresh();
+        WSWindowManager::the().invalidate(m_rect);
+    }
+}
diff --git a/Servers/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h
index 1702513085..e3d5016080 100644
--- a/Servers/WindowServer/WSWindowSwitcher.h
+++ b/Servers/WindowServer/WSWindowSwitcher.h
@@ -11,6 +11,8 @@ class WSWindow;
 
 class WSWindowSwitcher : public CObject {
 public:
+    static WSWindowSwitcher& the();
+
     WSWindowSwitcher();
     virtual ~WSWindowSwitcher() override;
 
@@ -22,10 +24,14 @@ public:
 
     void on_key_event(const WSKeyEvent&);
     void refresh();
+    void refresh_if_needed();
 
     void draw();
 
-    int item_height() { return 20; }
+    int thumbnail_width() { return 40; }
+    int thumbnail_height() { return 40; }
+
+    int item_height() { return 10 + thumbnail_height(); }
     int padding() { return 8; }
     int item_padding() { return 8; }