diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 7d48537771..800f5a30c1 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -1380,6 +1380,11 @@ const groupAreaClickChange = async () => {
     groupAreaCom.style.top = areaData.value.style.top
     groupAreaCom.style.width = areaData.value.style.width
     groupAreaCom.style.height = areaData.value.style.height
+    dvMainStore.setClickComponentStatus(true)
+    dvMainStore.setCurComponent({
+      component: groupAreaCom,
+      index: dvMainStore.componentData.length - 1
+    })
   } else if (groupAreaCom) {
     groupAreaHis.forEach(ele => {
       dvMainStore.deleteComponentById(ele.id)
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue b/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
index 2004f9f1e1..0b1041a12e 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComposeShow.vue
@@ -37,7 +37,7 @@ const handleMouseDown = e => {
     return
   }
   const index = areaData.value.components.findIndex(component => component === props.element)
-  if (index != -1) {
+  if (index != -1 && props.element.component !== 'GroupArea') {
     areaData.value.components.splice(index, 1)
     e.stopPropagation()
   }
diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index a8559c8291..b34d2bc013 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -424,7 +424,6 @@ const handleInnerMouseDownOnShape = e => {
     if (curComponent.value && curComponent.value.id !== element.value.id) {
       areaDataPush(curComponent.value)
     }
-    dvMainStore.setCurComponent({ component: null, index: null })
     e.stopPropagation()
     return
   }