Primary monitor being reset when toggling through all display modes

Starting scenario:

Laptop with 1 external monitor attached via HDMI (screen EXTENDED to the external monitor)
Main screen (with plank) is the laptop.
Go to display settings. Make second monitor the primary screen with the star icon on the left upper corner in the canvas. Plank goes on to external monitor.

Press super + p combination 4 times so that you change through all modes (monitor extends screen, monitor only, laptop only, duplicate view) and are back to "monitor extends laptop screen" mode.

Plank is now on the laptop screen. I want it to stay on the external monitor once I am back to the expand view mode.