#15: Windows fixes for menu behaviour