CMS-3329 Wizard - Save keyboard shortcut often gets "lost"