diff --git a/Userland/Services/WindowServer/Overlays.cpp b/Userland/Services/WindowServer/Overlays.cpp
index 916611ec7f..c5cedf2907 100644
--- a/Userland/Services/WindowServer/Overlays.cpp
+++ b/Userland/Services/WindowServer/Overlays.cpp
@@ -88,7 +88,7 @@ RectangularOverlay::RectangularOverlay()
 
 void RectangularOverlay::rect_changed(Gfx::IntRect const& previous_rect)
 {
-    if (m_rerender_on_location_change || rect().size() != previous_rect.size())
+    if (rect().size() != previous_rect.size())
         clear_bitmaps();
 }
 
@@ -99,6 +99,10 @@ void RectangularOverlay::clear_bitmaps()
 
 void RectangularOverlay::render(Gfx::Painter& painter, Screen const& screen)
 {
+    if (m_content_invalidated) {
+        clear_bitmaps();
+        m_content_invalidated = false;
+    }
     auto scale_factor = screen.scale_factor();
     auto* bitmap = m_rendered_bitmaps->find_bitmap(scale_factor);
     if (!bitmap) {
@@ -136,6 +140,12 @@ void RectangularOverlay::set_content_rect(Gfx::IntRect const& rect)
     set_rect(calculate_frame_rect(rect));
 }
 
+void RectangularOverlay::invalidate_content()
+{
+    m_content_invalidated = true;
+    invalidate();
+}
+
 Gfx::Font const* ScreenNumberOverlay::s_font { nullptr };
 
 ScreenNumberOverlay::ScreenNumberOverlay(Screen& screen)
@@ -211,7 +221,6 @@ Gfx::IntRect ScreenNumberOverlay::calculate_content_rect_for_screen(Screen& scre
 WindowGeometryOverlay::WindowGeometryOverlay(Window& window)
     : m_window(window)
 {
-    rerender_on_location_change(true);
     update_rect();
 }
 
@@ -254,7 +263,7 @@ void WindowGeometryOverlay::render_overlay_bitmap(Gfx::Painter& painter)
 void WindowGeometryOverlay::window_rect_changed()
 {
     update_rect();
-    invalidate();
+    invalidate_content();
 }
 
 DndOverlay::DndOverlay(String const& text, Gfx::Bitmap const* bitmap)
diff --git a/Userland/Services/WindowServer/Overlays.h b/Userland/Services/WindowServer/Overlays.h
index f2d45b9ec2..b675e9b0c9 100644
--- a/Userland/Services/WindowServer/Overlays.h
+++ b/Userland/Services/WindowServer/Overlays.h
@@ -100,14 +100,11 @@ protected:
     void clear_bitmaps();
     virtual void rect_changed(Gfx::IntRect const&) override;
 
-    void rerender_on_location_change(bool value)
-    {
-        m_rerender_on_location_change = value;
-    }
+    void invalidate_content();
 
 private:
     RefPtr<MultiScaleBitmaps> m_rendered_bitmaps;
-    bool m_rerender_on_location_change { false };
+    bool m_content_invalidated { false };
 };
 
 class ScreenNumberOverlay : public RectangularOverlay {