Simplified draw closing logic, made it close even if you choose the current item