diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
index 69e576bba604a..3d283d102e323 100644
--- a/lib/web/mage/collapsible.js
+++ b/lib/web/mage/collapsible.js
@@ -63,6 +63,12 @@ define([
                 this.icons = true;
             }
 
+            this.element.on('dimensionsChanged', function (e) {
+                if (e.target && e.target.classList.contains('active')) {
+                    this._scrollToTopIfVisible(e.target);
+                }
+            }.bind(this));
+
             this._bind('click');
             this._trigger('created');
         },
@@ -453,9 +459,6 @@ define([
             if (this.options.animate) {
                 this._animate(showProps);
             } else {
-                if (this.content.length) {
-                    this._scrollToTopIfVisible(this.content.get(0).parentElement);
-                }
                 this.content.show();
             }
             this._open();