Improved handling of drawing mode