Merge, rather than replace settings

In the process of tracking down a bug report I realized when we load a popup we replacing the previous settings rather than merging additions in.