diff --git a/extension/Source/sql/formEditor.sql b/extension/Source/sql/formEditor.sql
index 884e52421f88d42b55dfd58e62b94bb4014be18a..e2aeb3c701f216d7fd490eff3eae75f2b4104923 100644
--- a/extension/Source/sql/formEditor.sql
+++ b/extension/Source/sql/formEditor.sql
@@ -318,9 +318,11 @@ INSERT INTO FormElement (formId, name, label, mode, type, checkType, class, ord,
                          sql1, parameter, feIdContainer, subrecordOption, dynamicUpdate, bsLabelColumns, bsInputColumns,
                          bsNoteColumns, modeSql, placeholder, encode)
 VALUES (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120, 0, 0,
-        '<a href="{{documentation:Y}}#class-container">Info</a>', '', '',
+        '<a href="{{documentation:Y}}#class-container">Info</a>', '',
+        '{{feIdContainer:R:::{{SELECT fe.feIdContainer FROM FormElement AS fe WHERE fe.formId={{formId:S}} AND fe.feIdContainer!=0 ORDER BY fe.modified DESC LIMIT 1}}}}',
         '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name, " (", COUNT(feSub.id), ")" ) FROM FormElement As fe LEFT JOIN FormElement As feSub ON feSub.feIdContainer=fe.id WHERE fe.formId={{formId:SR0}} AND fe.class="container" GROUP BY fe.id ORDER BY fe.type, fe.ord, fe.name }}',
-        'emptyItemAtStart', 100, '', 'no', '', '', '',
+        'emptyItemAtStart',
+        100, '', 'no', '', '', '',
         '{{SELECT IF(COUNT(fe.id)>0, "show", "hidden") FROM Form AS f LEFT JOIN FormElement AS fe ON f.id=fe.formId AND fe.class="container" WHERE f.id={{formId:S0}} GROUP BY f.id}}',
         '', 'specialchar'),
        (2, 'enabled', 'Enabled', 'show', 'checkbox', 'all', 'native', 130, 0, 0,