diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js index c2cbfb7587..4ee31a6275 100644 --- a/src/components/scrollManager.js +++ b/src/components/scrollManager.js @@ -532,7 +532,9 @@ import layoutManager from 'layoutManager'; if (isEnabled()) { dom.addEventListener(window, 'focusin', function(e) { - scrollToElement(e.target, useSmoothScroll()); + setTimeout(function() { + scrollToElement(e.target, useSmoothScroll()); + }, 0); }, {capture: true}); } diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js index fb903d839c..9812ce3cc7 100644 --- a/src/elements/emby-scroller/emby-scroller.js +++ b/src/elements/emby-scroller/emby-scroller.js @@ -17,10 +17,12 @@ import 'css!./emby-scroller'; function initCenterFocus(elem, scrollerInstance) { dom.addEventListener(elem, 'focus', function (e) { - const focused = focusManager.focusableParent(e.target); - if (focused) { - scrollerInstance.toCenter(focused); - } + setTimeout(function() { + const focused = focusManager.focusableParent(e.target); + if (focused) { + scrollerInstance.toCenter(focused); + } + }, 0); }, { capture: true, passive: true