diff --git a/frontend/src/app/main/ui/components/numeric_input.cljs b/frontend/src/app/main/ui/components/numeric_input.cljs
index 258fe0035..8745d8e02 100644
--- a/frontend/src/app/main/ui/components/numeric_input.cljs
+++ b/frontend/src/app/main/ui/components/numeric_input.cljs
@@ -171,13 +171,13 @@
 
         handle-blur
         (mf/use-callback
-          (mf/deps parse-value apply-value update-input on-blur)
-          (fn [_]
-            (let [new-value (or (parse-value) default-val)]
-              (if new-value
-                (apply-value new-value)
-                (update-input new-value)))
-            (when on-blur (on-blur))))
+         (mf/deps parse-value apply-value update-input on-blur)
+         (fn [_]
+           (let [new-value (or (parse-value) default-val)]
+             (if new-value
+               (apply-value new-value)
+               (update-input new-value)))
+           (when on-blur (on-blur))))
 
         on-click
         (mf/use-callback
@@ -203,8 +203,7 @@
      (mf/deps value-str)
      (fn []
        (when-let [input-node (mf/ref-val ref)]
-         (when-not (dom/active? input-node)
-           (dom/set-value! input-node value-str)))))
+         (dom/set-value! input-node value-str))))
 
     (mf/use-effect
      (mf/deps handle-blur)
diff --git a/frontend/src/app/main/ui/workspace/viewport/utils.cljs b/frontend/src/app/main/ui/workspace/viewport/utils.cljs
index fe92fa46f..088d17549 100644
--- a/frontend/src/app/main/ui/workspace/viewport/utils.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/utils.cljs
@@ -49,17 +49,26 @@
 
         [width height]
         (if (or resize-x? resize-y?)
-          (let [pc (-> (gpt/point x y)
-                       (gpt/transform transform)
-                       (gpt/transform current-transform))
+          (let [pc (cond-> (gpt/point x y)
+                     (some? transform)
+                     (gpt/transform transform)
 
-                pw (-> (gpt/point (+ x width) y)
-                       (gpt/transform transform)
-                       (gpt/transform current-transform))
+                     (some? current-transform)
+                     (gpt/transform current-transform))
 
-                ph (-> (gpt/point x (+ y height))
-                       (gpt/transform transform)
-                       (gpt/transform current-transform))]
+                pw (cond-> (gpt/point (+ x width) y)
+                     (some? transform)
+                     (gpt/transform transform)
+
+                     (some? current-transform)
+                     (gpt/transform current-transform))
+
+                ph (cond-> (gpt/point x (+ y height))
+                     (some? transform)
+                     (gpt/transform transform)
+
+                     (some? current-transform)
+                     (gpt/transform current-transform))]
             [(gpt/distance pc pw) (gpt/distance pc ph)])
           [width height])]