Closes #57

I was also getting crashes when completely closing/removing the the drawer. 
(Login/logout screen design.) 
This fixes it for me.