diff --git a/CHANGES.md b/CHANGES.md
index 2fe22e810..c4cd604ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,7 @@
 
 ### :bug: Bugs fixed
 
+- Fix viewer scroll problems [Taiga 3403](https://tree.taiga.io/project/penpot/issue/3403)
 - Fix hide html options on handoff [Taiga 3533](https://tree.taiga.io/project/penpot/issue/3533)
 - Fix share prototypes overlay and stroke [Taiga #3994](https://tree.taiga.io/project/penpot/issue/3994)
 - Fix border radious on boolean operations [Taiga #3959](https://tree.taiga.io/project/penpot/issue/3959)
diff --git a/frontend/resources/styles/main/partials/viewer.scss b/frontend/resources/styles/main/partials/viewer.scss
index 30845460a..4fa9b3de1 100644
--- a/frontend/resources/styles/main/partials/viewer.scss
+++ b/frontend/resources/styles/main/partials/viewer.scss
@@ -10,7 +10,6 @@
   grid-row: 1 / span 2;
   grid-column: 1 / span 1;
   display: flex;
-  justify-content: center;
   align-items: center;
   flex-flow: wrap;
   overflow: auto;
@@ -56,8 +55,8 @@
   }
 
   & .viewer-go-next {
-    right: 0;
-    padding-right: 29px;
+    right: 8px;
+    width: 46px;
     svg {
       margin-left: 2px;
     }
@@ -81,12 +80,13 @@
 
   & .viewer-bottom {
     position: absolute;
-    bottom: 0;
-    height: 50px;
+    bottom: 8px;
+    height: 30px;
     width: 100%;
     display: flex;
     justify-content: space-between;
     align-items: center;
+    z-index: 2;
 
     &.left-bar {
       width: calc(100% - 512px);
@@ -128,6 +128,8 @@
   }
 
   & .viewer-wrapper {
+    margin-left: auto;
+    margin-right: auto;
     position: relative;
   }