diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
index 131a6d626d..ae3f22bfc1 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue
@@ -74,6 +74,7 @@
     <json-editable-cell
       v-else-if="isJSON"
       v-model="localState"
+      :is-form="isForm"
       v-on="parentListeners"
       @input="$emit('save')"
     />
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/jsonEditableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/jsonEditableCell.vue
index 9dc934561a..502dd4f69f 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/jsonEditableCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/jsonEditableCell.vue
@@ -1,20 +1,35 @@
 <template>
-  <div class="cell-container" @keydown.stop.enter>
-    <div v-if="!isForm" class="d-flex ma-1">
+  <v-dialog :is="expand ? 'v-dialog' : 'div'" :value="true" class="cell-container" @keydown.stop.enter>
+    <div class="d-flex pa-1 " :class="{backgroundColor:expand}">
       <v-spacer />
-      <v-btn outlined x-small class="mr-1" @click="$emit('cancel')">
-        Cancel
-      </v-btn>
-      <v-btn x-small color="primary" @click="save">
-        Save
+      <v-icon small class="mr-2" @click="expand = !expand">
+        {{ expand ? 'mdi-arrow-collapse' : 'mdi-arrow-expand' }}
+      </v-icon>
+      <template v-if="!isForm">
+        <v-btn outlined x-small class="mr-1" @click="$emit('cancel')">
+          Cancel
+        </v-btn>
+        <v-btn x-small color="primary" @click="save">
+          Save
+        </v-btn>
+      </template>
+      <v-btn v-else-if="expand" x-small @click="expand=false">
+        Close
       </v-btn>
     </div>
     <monaco-json-object-editor
+      v-if="expand"
+      v-model="localState"
+      class="text-left caption"
+      style="width: 300px;min-height:500px;min-width:100%"
+    />
+    <monaco-json-object-editor
+      v-else
       v-model="localState"
       class="text-left caption"
-      style="width: 300px;min-height: 200px;min-width:100%"
+      style="width: 300px;min-height:200px;min-width:100%"
     />
-  </div>
+  </v-dialog>
 </template>
 
 <script>
@@ -28,7 +43,8 @@ export default {
     isForm: Boolean
   },
   data: () => ({
-    localState: ''
+    localState: '',
+    expand: false
   }),
   computed: {
 
@@ -70,6 +86,7 @@ export default {
   },
   methods: {
     save() {
+      this.expand = false
       this.$emit('input', JSON.stringify(this.localState))
     }
   }
diff --git a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
index 36f4a652bd..e56d9e9050 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
@@ -148,7 +148,7 @@
                       class="xc-input body-2"
                       :meta="meta"
                       :sql-ui="sqlUi"
-                      is-form
+                      :is-form="true"
                       @focus="active = col._cn"
                       @blur="active = ''"
                       @input="$set(changedColumns,col._cn, true)"