diff --git a/frontend/src/app/main/ui/flex_controls/gap.cljs b/frontend/src/app/main/ui/flex_controls/gap.cljs
index bd38eba107..e04024d862 100644
--- a/frontend/src/app/main/ui/flex_controls/gap.cljs
+++ b/frontend/src/app/main/ui/flex_controls/gap.cljs
@@ -121,9 +121,9 @@
         pill-height                (/ fcc/flex-display-pill-height zoom)
         workspace-modifiers        (mf/deref refs/workspace-modifiers)
         gap-selected               (mf/deref refs/workspace-gap-selected)
-        hover                      (mf/use-var nil)
-        hover-value                (mf/use-var 0)
-        mouse-pos                  (mf/use-var nil)
+        hover                      (mf/use-state nil)
+        hover-value                (mf/use-state 0)
+        mouse-pos                  (mf/use-state nil)
         padding                    (:layout-padding frame)
         gap                        (:layout-gap frame)
         {:keys [width height x1 y1]} (:selrect frame)
diff --git a/frontend/src/app/main/ui/flex_controls/margin.cljs b/frontend/src/app/main/ui/flex_controls/margin.cljs
index 5ee7d33c55..b764972e0f 100644
--- a/frontend/src/app/main/ui/flex_controls/margin.cljs
+++ b/frontend/src/app/main/ui/flex_controls/margin.cljs
@@ -89,9 +89,9 @@
         pill-width                 (/ fcc/flex-display-pill-width zoom)
         pill-height                (/ fcc/flex-display-pill-height zoom)
         margins-selected           (mf/deref refs/workspace-margins-selected)
-        hover-value                (mf/use-var 0)
-        mouse-pos                  (mf/use-var nil)
-        hover                      (mf/use-var nil)
+        hover-value                (mf/use-state 0)
+        mouse-pos                  (mf/use-state nil)
+        hover                      (mf/use-state nil)
         hover-all?                 (and (not (nil? @hover)) alt?)
         hover-v?                   (and (or (= @hover :m1) (= @hover :m3)) shift?)
         hover-h?                   (and (or (= @hover :m2) (= @hover :m4)) shift?)
diff --git a/frontend/src/app/main/ui/flex_controls/padding.cljs b/frontend/src/app/main/ui/flex_controls/padding.cljs
index 5b64c94fb3..96e0c07d8f 100644
--- a/frontend/src/app/main/ui/flex_controls/padding.cljs
+++ b/frontend/src/app/main/ui/flex_controls/padding.cljs
@@ -77,7 +77,6 @@
        :y (:y rect-data)
        :width (max 0 (:width rect-data))
        :height (max 0 (:height rect-data))
-
        :on-pointer-enter on-pointer-enter
        :on-pointer-leave on-pointer-leave
        :on-pointer-move on-pointer-move
@@ -115,9 +114,9 @@
   [{:keys [frame zoom alt? shift? on-move-selected on-context-menu]}]
   (let [frame-id                           (:id frame)
         paddings-selected                  (mf/deref refs/workspace-paddings-selected)
-        hover-value                        (mf/use-var 0)
-        mouse-pos                          (mf/use-var nil)
-        hover                              (mf/use-var nil)
+        hover-value                        (mf/use-state 0)
+        mouse-pos                          (mf/use-state nil)
+        hover                              (mf/use-state nil)
         hover-all?                         (and (not (nil? @hover)) alt?)
         hover-v?                           (and (or (= @hover :p1) (= @hover :p3)) shift?)
         hover-h?                           (and (or (= @hover :p2) (= @hover :p4)) shift?)