diff --git a/CHANGES.md b/CHANGES.md
index 593baaf3d..6b313a2cf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,7 @@
 - Fix problems with locked layers [Taiga #5139](https://tree.taiga.io/project/penpot/issue/5139)
 - Fix export from shared prototype [Taiga #5565](https://tree.taiga.io/project/penpot/issue/5565)
 - Fix email change: validation error displaying even after both fields are identical [Taiga #5514](https://tree.taiga.io/project/penpot/issue/5514)
+- Fix scroll on viewer comment list [Taiga #5563](https://tree.taiga.io/project/penpot/issue/5563)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/resources/styles/main/partials/comments.scss b/frontend/resources/styles/main/partials/comments.scss
index b2d89ce3f..7c2d4bf00 100644
--- a/frontend/resources/styles/main/partials/comments.scss
+++ b/frontend/resources/styles/main/partials/comments.scss
@@ -246,7 +246,7 @@
   pointer-events: auto;
 
   .thread-groups {
-    height: 100%;
+    height: calc(100% - 34px);
     overflow-y: scroll;
     hr {
       border: 0;
diff --git a/frontend/resources/styles/main/partials/viewer.scss b/frontend/resources/styles/main/partials/viewer.scss
index 1ed55ff1c..7f26f4206 100644
--- a/frontend/resources/styles/main/partials/viewer.scss
+++ b/frontend/resources/styles/main/partials/viewer.scss
@@ -182,7 +182,7 @@
     right: 0;
     top: 50px;
     width: 256px;
-    height: 100%;
+    height: calc(100vh - 48px);
     z-index: 10;
   }