Modal window fixes

git-svn-id: 6d6ade8e88b1292e17cba3559b7335a947e495e0@522075 13f79535-47bb-0310-9956-ffa450edef68


Cleanup DisableCmd