diff --git a/src/web/assets/cp/src/js/BaseElementSelectInput.js b/src/web/assets/cp/src/js/BaseElementSelectInput.js index 48c5b609303..2465a1b3043 100644 --- a/src/web/assets/cp/src/js/BaseElementSelectInput.js +++ b/src/web/assets/cp/src/js/BaseElementSelectInput.js @@ -573,7 +573,7 @@ Craft.BaseElementSelectInput = Garnish.Base.extend( const lastElementIndex = this.$elements.index($elements.last()); $nextElement = this.$elements.eq(lastElementIndex + 1); } - if ($nextElement.length) { + if ($nextElement && $nextElement.length) { $nextElement.focus(); } else { this.focusNextLogicalElement();