Fixed focus behavior in shortcut editor