Fix #156 choose window behavior