Reenable fix for command tab