diff --git a/init.lua b/init.lua
index 93d8997..b535f58 100644
--- a/init.lua
+++ b/init.lua
@@ -390,6 +390,11 @@ function PaperWM:stop()
     for _, watcher in pairs(ui_watchers) do watcher:stop() end
     screen_watcher:stop()
 
+    -- fit all windows within the bounds of the screen
+    for _, window in ipairs(self.window_filter:getWindows()) do
+        window:setFrameInScreenBounds()
+    end
+
     return self
 end