diff --git a/plugins/admin/modules/tools/generator.go b/plugins/admin/modules/tools/generator.go
index f6aba58a9..4dc63b17c 100644
--- a/plugins/admin/modules/tools/generator.go
+++ b/plugins/admin/modules/tools/generator.go
@@ -91,6 +91,8 @@ func NewParam(cfg Config) Param {
 		dbTable = cfg.Schema + "." + cfg.Table
 	}
 
+	fields := getFieldsFromConn(cfg.Conn, dbTable, cfg.Driver)
+
 	return Param{
 		Connection:               cfg.Connection,
 		Driver:                   cfg.Driver,
@@ -114,7 +116,8 @@ func NewParam(cfg Config) Param {
 		HideResetButton:          cfg.HideResetButton,
 		HideBackButton:           cfg.HideBackButton,
 		RowTable:                 cfg.Table,
-		Fields:                   getFieldsFromConn(cfg.Conn, dbTable, cfg.Driver),
+		Fields:                   fields,
+		FormFields:               fields,
 		Output:                   cfg.Output,
 	}
 }