diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts
index 9ff8d78cba..4c93d55b7a 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts
@@ -122,12 +122,13 @@ export class CalculatedFieldTestArgumentsComponent extends PageComponent impleme
   openEditJSONDialog(group: FormGroup): void {
     this.dialog.open<JsonObjectEditDialogComponent, JsonObjectEditDialogData, CalculatedFieldArgumentEventValue>(JsonObjectEditDialogComponent, {
       disableClose: true,
-      height: '65vh',
+      height: '760px',
       minWidth: 'min(700px, 100%)',
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
         jsonValue: group.value,
-        required: true
+        required: true,
+        fillHeight: true
       }
     }).afterClosed()
       .pipe(filter(Boolean))
diff --git a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
index 9fcb3a496a..44f5040010 100644
--- a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
@@ -35,7 +35,7 @@
         class="block h-full"
         label="{{ 'value.json-value' | translate }}"
         [jsonRequired]="required"
-        [fillHeight]="false">
+        [fillHeight]="data.fillHeight">
       </tb-json-object-edit>
     </fieldset>
   </div>
diff --git a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
index a0ffb6b373..d1bc76e194 100644
--- a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
@@ -30,6 +30,7 @@ export interface JsonObjectEditDialogData {
   title?: string;
   saveLabel?: string;
   cancelLabel?: string;
+  fillHeight?: boolean;
 }
 
 @Component({
diff --git a/ui-ngx/src/app/shared/components/json-object-edit.component.html b/ui-ngx/src/app/shared/components/json-object-edit.component.html
index bd6e2c06bb..0aa28474d5 100644
--- a/ui-ngx/src/app/shared/components/json-object-edit.component.html
+++ b/ui-ngx/src/app/shared/components/json-object-edit.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<div class="flex h-full flex-col" style="background: #fff;" [class.fill-height]="fillHeight"
+<div class="flex flex-col" style="background: #fff;" [class.fill-height]="fillHeight"
      tb-fullscreen
      [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()">
   <div class="tb-json-object-toolbar flex flex-row items-center justify-start">