diff --git a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js
index a3a6966..eae7197 100644
--- a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js
+++ b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/detail.controller.js
@@ -152,11 +152,12 @@
     };
 
     that.toBottom = function() {
-      $document.find("html, body").animate({scrollTop: document.body.scrollHeight});
+      var $content = $document.find('coral-shell-content');
+      $content.animate({scrollTop: $content[0].scrollHeight});
     };
 
     that.toTop = function() {
-      $document.find("html, body").animate({scrollTop: 0});
+      $document.find('coral-shell-content').animate({scrollTop: 0});
     };
 
     /**
diff --git a/changes.xml b/changes.xml
index a79b550..a474291 100644
--- a/changes.xml
+++ b/changes.xml
@@ -36,6 +36,9 @@
       <action type="update" dev="sseifert">
         Switch to AEM 6.5.17 as minimum version.
       </action>
+      <action type="fix" dev="mpankratiev" issue="32">
+        Fix toTop/toBottom scrolling buttons.
+      </action>
     </release>
 
     <release version="1.15.8" date="2023-11-22">