Prevents excess popups

Makes cancel work properly