diff --git a/cybersyn/scripts/gui/main.lua b/cybersyn/scripts/gui/main.lua
index 76305de..ae7d033 100644
--- a/cybersyn/scripts/gui/main.lua
+++ b/cybersyn/scripts/gui/main.lua
@@ -47,7 +47,7 @@ end
 local manager_gui = {}
 
 function manager_gui.on_lua_shortcut(e)
-	if e.prototype_name == "cybersyn-toggle-gui" or e.input_name == "cybersyn-toggle-gui" then
+	if e.prototype_name == "cybersyn-toggle-gui" or e.input_name == "cybersyn-toggle-gui" or e.element.name == "manager_window" then
 		manager.wrapper(e, manager.handle.manager_toggle)
 	end
 end
diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index e276892..db631c7 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -955,6 +955,7 @@ local function main()
 		script.on_event(defines.events.on_player_removed, manager.on_player_removed)
 		script.on_event(defines.events.on_player_created, manager.on_player_created)
 		script.on_event(defines.events.on_lua_shortcut, manager.on_lua_shortcut)
+		script.on_event(defines.events.on_gui_closed, manager.on_lua_shortcut)
 		script.on_event("cybersyn-toggle-gui", manager.on_lua_shortcut)
 	end