From 53d2e8c0d29eec892193b6ff8bcd5d31d7adb6dd Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 15 Mar 2020 02:18:27 +0300
Subject: [PATCH] Always try to blur foreign element

---
 src/components/dialogHelper/dialogHelper.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index b9bc71bc1..d8ddc13c0 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -242,9 +242,12 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         var onAnimationFinish = function () {
             focusManager.pushScope(dlg);
+
             if (dlg.getAttribute('data-autofocus') === 'true') {
                 focusManager.autoFocus(dlg);
-            } else if (document.activeElement && !dlg.contains(document.activeElement)) {
+            }
+
+            if (document.activeElement && !dlg.contains(document.activeElement)) {
                 // Blur foreign element to prevent triggering of an action from the previous scope
                 document.activeElement.blur();
             }