Simplify on demand dialog locking

Thanks for the idea @Tungstwenty