diff --git a/CHANGES.md b/CHANGES.md
index 136aff9b0..45bce8bcb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@
 - Fix problem when flattening booleans losing styles [Taiga #2217](https://tree.taiga.io/project/penpot/issue/2217)
 - Add shortcuts to boolean icons popups [Taiga #2220](https://tree.taiga.io/project/penpot/issue/2220)
 - Fix a worker error when transforming a rectangle into path
+- Fix max/min values for opacity fields [Taiga #2183](https://tree.taiga.io/project/penpot/issue/2183)
 
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
diff --git a/frontend/src/app/main/ui/components/numeric_input.cljs b/frontend/src/app/main/ui/components/numeric_input.cljs
index bd114983d..47595beac 100644
--- a/frontend/src/app/main/ui/components/numeric_input.cljs
+++ b/frontend/src/app/main/ui/components/numeric_input.cljs
@@ -34,9 +34,18 @@
 
         value (d/parse-integer value-str 0)
 
-        min-val (when (string? min-val-str)
+        min-val (cond
+                  (number? min-val-str)
+                  min-val-str
+
+                  (string? min-val-str)
                   (d/parse-integer min-val-str))
-        max-val (when (string? max-val-str)
+
+        max-val (cond
+                  (number? max-val-str)
+                  max-val-str
+
+                  (string? max-val-str)
                   (d/parse-integer max-val-str))
 
         num? (fn [val] (and (number? val)