I find the tilt a little annoying too, but I'm not sure a locking mechanism is the answer. I lift the heater off after each draw, so a twist thing would be a little annoying. And what if it gets stuck? Making the tolerences finer to reduce wobble also brings risks of sticking. My solution has been to keep holding the handle unless the heater is at rest on the stand. Seems safer that way too.