Weapon Swap gets mixed up when leaving map

I use weapon set 2 quite often. When leaving map and entering HO, the current weapons are considered to be set 1. Pressing X once will change the tabs to set 2, and correctly keep the current items. Pressing it again will correctly reset to weapon set 1.

This is noticeable when importing through PoB. It will swap the weapons between the two sets.