diff --git a/CHANGES.md b/CHANGES.md
index 619de08d60..ebd9aa992a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -78,6 +78,7 @@
 - Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273)
 - Fix problem with SVG import [Github #4888](https://github.com/penpot/penpot/issues/4888)
 - Fix problem with overlay positions in viewer [Taiga #8464](https://tree.taiga.io/project/penpot/issue/8464)
+- Fix layer panel overflowing [Taiga #8665](https://tree.taiga.io/project/penpot/issue/8665)
 
 ## 2.1.5
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss b/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss
index cd12ae5727..c24801d0f5 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.scss
@@ -55,6 +55,7 @@
   overflow-x: hidden;
   overflow-y: overlay;
   scrollbar-gutter: stable;
+  max-width: var(--width);
 }
 
 .pages-list {