Lauri Timmanee
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
        // In these instances, force focus on the dialog.
        if (document.activeElement === document.body) {
          $dialog.dialog('widget').trigger('focus');
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
        // If the body element has focus, it means focus was effectively lost.
        // In these instances, force focus on the dialog.
        if (document.activeElement === document.body) {
-          $dialog.dialog('widget').trigger('focus');
+          // Bypass media as it has its own focus handling.
+          if (
+            document.getElementsByClassName('media-library-widget-modal').length
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
        }

-        // If the body element has focus, it means focus was effectively lost.
-        // In these instances, force focus on the dialog.
-        if (document.activeElement === document.body) {
-          $dialog.dialog('widget').trigger('focus');
-        }
+        // If the focus is outside of active element move it to the first focusable element.
+        setTimeout(function () {
+          const dialogInstance = $dialog.dialog('instance');
+
+          // Check if the dialog has focus
+          if (dialogInstance && dialogInstance._focusedElement) {
+            const focusedElement = dialogInstance._focusedElement;
+            // Check if the focused element is inside the document.body
+            const isInsideBody = document.body.contains(focusedElement[0]);
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
-        // If the body element has focus, it means focus was effectively lost.
-        // In these instances, force focus on the dialog.
-        if (document.activeElement === document.body) {
-          $dialog.dialog('widget').trigger('focus');
-        }
+        // If the focus is outside of active element move it to the first focusable element.
+        setTimeout(function () {
+          const dialogInstance = $dialog.dialog('instance');
+
+          // Check if the dialog has focus.
+          if (dialogInstance && dialogInstance._focusedElement) {
+            const focusedElement = dialogInstance._focusedElement;
+            // Check if the focused element is inside the dialog.
+            const isInsideDialog = $dialog[0].contains(focusedElement[0]);
+
+            if (!isInsideDialog || document.activeElement === document.body) {