diff --git a/CHANGES.md b/CHANGES.md
index dfd0a30cb..d86a920e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@
 - Fix wrong shortcut button tip of "Delete" function [Taiga #4162](https://tree.taiga.io/project/penpot/issue/4162)
 - Fix error after user drags any layer in search functionality [Taiga #4161](https://tree.taiga.io/project/penpot/issue/4161)
 - Fix font search works only with lowercase letters [Taiga #4140](https://tree.taiga.io/project/penpot/issue/4140)
+- Fix Terms and Privacy links overlapping [Taiga #4137](https://tree.taiga.io/project/penpot/issue/4137)
 
 ## 1.15.3-beta
 
diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss
index 574343485..b092b7e23 100644
--- a/frontend/resources/styles/main/layouts/login.scss
+++ b/frontend/resources/styles/main/layouts/login.scss
@@ -11,6 +11,8 @@
   display: grid;
   grid-template-rows: auto;
   grid-template-columns: 33% auto;
+  height: 100vh;
+  overflow-y: scroll;
 }
 
 .auth-sidebar {
@@ -53,6 +55,7 @@
   height: 100vh;
   justify-content: center;
   position: relative;
+  min-height: 48rem;
 
   input {
     margin-bottom: 0px;