Made Manual Popups follow the Preference Setting