diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue
index 07a98adb..0e366ba0 100644
--- a/src/components/AiAreaPicker.vue
+++ b/src/components/AiAreaPicker.vue
@@ -188,11 +188,11 @@ export default {
       })
 
       if (this.selected.type == 5) {
-        fullName = fullName + this.selected.name
+        fullName = fullName + (this.selected.name || this.areaName)
       }
-      this.areaName = this.selected.name
+      this.areaName = this.selected.name || this.areaName
       this.$emit('update:fullName', fullName)
-      this.$emit('update:name', this.selected.name)
+      this.$emit('update:name', (this.selected.name || this.areaName))
       this.closePopup()
     },
     getChild(op) {