Allow the 'Activate' key to close the countdialog window; cleanups
use cancel methid
Merge remote-tracking branch 'swick/countdialog'