diff --git a/CHANGES.md b/CHANGES.md
index d224681a4..bccfd6bdb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -42,6 +42,7 @@
 - Fix inviting to non existing users can fail [Taiga #4108](https://tree.taiga.io/project/penpot/issue/4108)
 - Fix components marked as touched when moved [Taiga #4061](https://tree.taiga.io/project/penpot/task/4061)
 - Fix boards grouped shouldn't show the title [Taiga #4251](https://tree.taiga.io/project/penpot/issue/4251)
+- Fix gradient handlers are under resize handlers[Taiga #4298](https://tree.taiga.io/project/penpot/issue/4298)
 
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 46ad6bdb9..7a99dac29 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -337,11 +337,6 @@
            :on-frame-leave on-frame-leave
            :on-frame-select on-frame-select}])
 
-       (when show-gradient-handlers?
-         [:& gradients/gradient-handlers
-          {:id (first selected)
-           :zoom zoom}])
-
        (when show-draw-area?
          [:& drawarea/draw-area
           {:shape drawing-obj
@@ -441,4 +436,9 @@
               :zoom zoom
               :objects objects-modified
               :current-transform transform
-              :hover-disabled? hover-disabled?}])])]]]))
+              :hover-disabled? hover-disabled?}])])
+
+       (when show-gradient-handlers?
+         [:& gradients/gradient-handlers
+          {:id (first selected)
+           :zoom zoom}])]]]))