diff --git a/CHANGES.md b/CHANGES.md
index a8814666b..4a0d6c3bb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@
 - Remove interactions when the destination artboard is deleted [Taiga #1656](https://tree.taiga.io/project/penpot/issue/1656).
 - Fix problem with fonts that ends with numbers [#940](https://github.com/penpot/penpot/issues/940).
 - Fix problem with imported SVG on editing paths [#971](https://github.com/penpot/penpot/issues/971)
+- Fix problem with color picker positioning
 
 
 ### :arrow_up: Deps updates
diff --git a/frontend/resources/styles/main/partials/workspace.scss b/frontend/resources/styles/main/partials/workspace.scss
index acbf99e0e..f167e9814 100644
--- a/frontend/resources/styles/main/partials/workspace.scss
+++ b/frontend/resources/styles/main/partials/workspace.scss
@@ -134,8 +134,8 @@
     width: 100%;
 
     display: grid;
-    grid-template-rows: 20px 1fr;
-    grid-template-columns: 20px 1fr;
+    grid-template-rows: 20px 100%;
+    grid-template-columns: 20px 100%;
   }
 
   .viewport {
@@ -145,6 +145,11 @@
     overflow: hidden;
     position: relative;
 
+    svg {
+      widht: 100%;
+      height: 100%;
+    }
+
     .viewport-overlays {
       position: absolute;
       width: 100%;