Merge pull request #197 from rpbouman/master

BISERVER-8896: ensure buttons are disabled when the dialog pops up.