diff --git a/lib/zin/wg/formpanel/v1.php b/lib/zin/wg/formpanel/v1.php
index 572faa0aaa..5eeb766d93 100644
--- a/lib/zin/wg/formpanel/v1.php
+++ b/lib/zin/wg/formpanel/v1.php
@@ -233,6 +233,7 @@ class formPanel extends panel
      */
     protected function buildForm(): node
     {
+        $fields       = $this->prop('fields', array());
         $customFields = $this->prop('customFields', array());
         $listFields   = zget($customFields, 'list', array());
         $showFields   = zget($customFields, 'show', array());
@@ -269,7 +270,7 @@ class formPanel extends panel
             set::className($this->prop('formClass')),
             set($this->props->pick($formProps)),
             $this->children(),
-            $this->prop('showExtra') ? $this->buildExtraMain() : null,
+            $this->prop('showExtra') && !$fields ? $this->buildExtraMain() : null,
             $hiddenFields ? jsVar('hiddenFields', $hiddenFields) : null
         );
     }