diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index 939c8af4b..a472c75bf 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -596,16 +596,15 @@ module.exports = { * On frame scroll callback * @private */ - onFrameScroll(e) { - var el = this.cacheEl; + onFrameScroll() { + const el = this.cacheEl; + if (el) { - var elPos = this.getElementPos(el); + const elPos = this.getElementPos(el); this.updateBadge(el, elPos); - var model = this.em.getSelected(); - - if (model) { - this.updateToolbarPos(model.view.el); - } + const model = this.em.getSelected(); + const viewEl = model && model.getEl(); + viewEl && this.updateToolbarPos(viewEl); } },