Handle more action directly in WindowsManager, fixes #585