This was solved when updating the drawer for https://jira.xwiki.org/browse/XWIKI-18007. In this update, a `close drawer` button has been added: