Minor fixes.  Fixed issue with Dialog close button triggering on keyup or mouseup