Well whaddaya know!
I realised that in the middle of turning the "each folder in its own window" off and then "on" again, I hadn't checked in the "middle" position.
The machine now has "each folder in its own window" NOT ticked, and it's behaving fine. For the moment, anyway.
Sounds like a switch wired backwards, doesn't it!