I think this is the kind of thing I would do If I had to choose between OSs with frequency, either home lab/experimentation or linux for stuffs and windows for games kind of scenario.

So there is nothing to fix, the nice choice screen is a feature.