diff --git a/awesome/rc.lua b/awesome/rc.lua
index a2492f3..7a60178 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -145,6 +145,16 @@ client.connect_signal("property::maximized", function(focused)
      focused.minimized = false
 end)
 
+client.connect_signal("unmanage", function(unmanaged)
+    if unmanaged.maximized then
+        for i, c in ipairs(client.get()) do
+            if not c.floating and c.screen == unmanaged.screen then
+                c.minimized = false
+            end
+        end
+    end
+end)
+
 client.connect_signal("focus", function(c)
   c.border_color = beautiful.border_focus
 end)