fix collapse breaking during any other action