Fix choose window behavior