restore custom kill window behavior
Merge remote-tracking branch 'origin/h10-gentoo-danil' into h9-gentoo-danil