I don't like your patch much as I think there is an actual issue underneath this
ticket that needs to be fixed.

What's the control terminal? Does it use the same dialog as SADD?