Fix unchecked popup-only setting

Looking back at the code from before the rewrite, the code for handling
this setting wasn't any better before. Someday, we should refactor this.
For now, let's make sure it's not broken.