There were a few weirdnesses in screenshot and wallpaper dialogs. The screenshot dialog fix turned into a cleanup.