Bugfix: When not using pop-up, context has to be specially reset