diff --git a/framework/elsa/fit-elsa-react/src/components/DefaultRoot.jsx b/framework/elsa/fit-elsa-react/src/components/DefaultRoot.jsx
index 16e8b0642..35c046214 100644
--- a/framework/elsa/fit-elsa-react/src/components/DefaultRoot.jsx
+++ b/framework/elsa/fit-elsa-react/src/components/DefaultRoot.jsx
@@ -161,7 +161,7 @@ export const DefaultRoot = forwardRef(function (
               <div className="sticky-header">
                 {shape.drawer.getHeaderComponent(data, shapeStatus)}
                 <div className="jade-form-drawer-close" onClick={() => {
-                  shape.page.onConfigShape = undefined;
+                  shape.unSelect();
                   setOpen(false);
                 }}>
                   <CloseOutlined style={{fontSize: '12px'}}/>
diff --git a/framework/elsa/fit-elsa-react/src/components/base/jadeNode.jsx b/framework/elsa/fit-elsa-react/src/components/base/jadeNode.jsx
index 770feeb0a..6d96e96a3 100644
--- a/framework/elsa/fit-elsa-react/src/components/base/jadeNode.jsx
+++ b/framework/elsa/fit-elsa-react/src/components/base/jadeNode.jsx
@@ -505,5 +505,16 @@ export const jadeNode = (id, x, y, width, height, parent, drawer) => {
     }
   };
 
+  /**
+   * @override
+   */
+  const unSelect = self.unSelect;
+  self.unSelect = () => {
+    unSelect.apply(self, []);
+    if (self.page.onConfigShape === self.id) {
+      self.page.onConfigShape = undefined;
+    }
+  };
+
   return self;
 };