yet anoter drawer improvement
merge upstream/master