Fixed maximised windows always restoring on the primary monitor

Sorry I didn't get this done sooner, I've really not been so well this week.
The fix turned out to be trivial. We just need to always set the window position, and do it before maximising.