diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5f7c2b74487..8440238c2c99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
 - PIM-11001: Fix code filter on attributes grid with special character
 - PIM-11002: Fix bad context locale used in DQI dashboard families widget
 - PIM-10997: Update error message when trying to delete role with linked users or connections
+- PIM-11003: Fix scrolling on Product edit form attributes
 
 ## Improvements
 
diff --git a/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/js/router.js b/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/js/router.js
index 212f970a3186..8e890125c2ea 100644
--- a/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/js/router.js
+++ b/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/js/router.js
@@ -95,7 +95,7 @@ define([
           }
 
           $('#container').empty();
-          var $view = $('<div class="view"></div>').appendTo($('#container'));
+          var $view = $('<div class="view-global"></div>').appendTo($('#container'));
 
           if (controller.feature && !FeatureFlags.isEnabled(controller.feature)) {
             this.hideLoadingMask();
diff --git a/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/less/pages/Default.less b/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/less/pages/Default.less
index 3a15a11b7422..13b33f295e2c 100644
--- a/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/less/pages/Default.less
+++ b/src/Akeneo/Platform/Bundle/UIBundle/Resources/public/less/pages/Default.less
@@ -156,6 +156,9 @@
 /* Temporary block */
 .view {
   height: 100%;
+}
+.view-global {
+  height: 100%;
   overflow: auto;
 }
 .app {