diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp
index 86966089de..a29c74a01b 100644
--- a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp
+++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp
@@ -322,7 +322,9 @@ void ComponentPeer::handleMovedOrResized()
         component.sendVisibilityChangeMessage();
     }
 
-    if (! isFullScreen())
+    const auto windowInSpecialState = isFullScreen() || isKioskMode() || nowMinimised;
+
+    if (! windowInSpecialState)
         lastNonFullscreenBounds = component.getBounds();
 }