Todo: avoid empty screen with just a line on start

Since the code said TODO, here it is. (It was also annoying me)