FORGE-1570: Fixed scenario where UICommands become wizards