diff --git a/CHANGES.md b/CHANGES.md
index ae136b8e84..66e155fe31 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,8 @@
 ### :bug: Bugs fixed
 - Fix components groups items show the component name in list mode [Taiga #4770](https://tree.taiga.io/project/penpot/issue/4770)
 - Fix typing CMD+Z on MacOS turns the cursor into a Zoom cursor [Taiga #4778](https://tree.taiga.io/project/penpot/issue/4778)
+- Fix white space on small screens [Taiga #4774](https://tree.taiga.io/project/penpot/issue/4774)
+- Fix button spacing on delete acount modal [Taiga #4762](https://tree.taiga.io/project/penpot/issue/4762)
 
 
 ## 1.17.0
diff --git a/frontend/resources/styles/main/partials/workspace.scss b/frontend/resources/styles/main/partials/workspace.scss
index 1128ba62f3..1331b47e06 100644
--- a/frontend/resources/styles/main/partials/workspace.scss
+++ b/frontend/resources/styles/main/partials/workspace.scss
@@ -17,7 +17,7 @@ $height-palette-max: 80px;
 
 #workspace {
   width: 100vw;
-  height: 100vh;
+  height: 100%;
   user-select: none;
   background-color: $color-canvas;
   display: grid;
@@ -37,6 +37,8 @@ $height-palette-max: 80px;
   .left-toolbar {
     grid-area: toolbar;
     width: $width-left-toolbar;
+    overflow-y: scroll;
+    overflow-x: hidden;
   }
 
   .settings-bar.settings-bar-left {