diff --git a/public/js/content.js b/public/js/content.js
index <HASH>..<HASH> 100644
--- a/public/js/content.js
+++ b/public/js/content.js
@@ -567,7 +567,7 @@ apos.modal = function(sel, options) {
       // If we don't have a select element first - focus the first input.
       // We also have to check for a select element within an array as the first field.
       if ($el.find("form:not(.apos-filter) .apos-fieldset:first.apos-fieldset-selectize, form:not(.apos-filter) .apos-fieldset:first.apos-fieldset-array .apos-fieldset:first.apos-fieldset-selectize").length === 0 ) {
-        $el.find("form:not(.apos-filter) :input:visible:enabled:first").focus();
+        $el.find("form:not(.apos-filter) .apos-fieldset:not([data-extra-fields-link]):first :input:visible:enabled:first").focus();
       }
     });
   });
fixed #<I> 'First select field in SlideshowEditor opens with focus when limit:1 is set'