Fixed #6259 (Gateway widget form layout)
(cherry picked from commit f5ee7cfd7c2e3f9e7383fb41c47f77bad3507cfc)
Fixed #6259 (Gateway widget form layout)
(cherry picked from commit f5ee7cfd7c2e3f9e7383fb41c47f77bad3507cfc)