Redo Windows GUI fix from bee2c8ccf82515443993a41adbc9c68faf7af5cb