Fix for expanded desktop & navbar settings