MainWindow: Further simplification

Looking at this now this can be simplified even further.