Allow the 'Activate' key to close the countdialog window

+ small cleanups