Improve choose window behavior