Issue #3380058: Focus lost/changed after ajax refresh

core/misc/ajax.js

@@ -1096,6 +1096,20 @@
                   'data-drupal-selector',
                 )}"]`,
               );
+
+              // If target is not a focusable element look for triggering
+              // element via classes or first tabbable element to focus on.
+              if (target && !isFocusable(target)) {
+                const prevParentClasslist = elementParents[n + 1].classList;
+                const classListString =
+                  Array.from(prevParentClasslist).join('.');
+                const selector = `.${classListString}`;
+                if (target.querySelector(selector)) {
+                  target = target.querySelector(selector);
+                } else {
+                  target = tabbable(target)[0];
+                }
+              }
             }
             if (target) {
               $(target).trigger('focus');