diff --git a/modules/Cockpit/assets/components.js b/modules/Cockpit/assets/components.js
index a95cb5f0e..c220f6084 100755
--- a/modules/Cockpit/assets/components.js
+++ b/modules/Cockpit/assets/components.js
@@ -3182,6 +3182,21 @@ riot.tag2('field-layout', '<div class="uk-sortable layout-components {!items.len
                 return;
             }
 
+            if (def.options && def.options.preview) {
+
+                if (typeof(def.options.preview) == 'string') {
+
+                    try {
+                        def.options.preview = new Function('$v', '$c', '$def', `return \`${def.options.preview}\`;`);
+                    } catch(e) {
+                        console.warn(e);
+                        def.options.preview = null;
+                    }
+                }
+
+                return (def.options.preview && def.options.preview(component.settings || {}, component, def)) || '';
+            }
+
             if (['heading', 'button'].indexOf(component.component) > -1) {
                 return component.settings.text ? '<div class="uk-text-truncate">'+App.Utils.stripTags(component.settings.text)+'</div>':'';
             }
diff --git a/modules/Cockpit/assets/components/field-layout.tag b/modules/Cockpit/assets/components/field-layout.tag
index 09f8c67fd..2473cf0df 100644
--- a/modules/Cockpit/assets/components/field-layout.tag
+++ b/modules/Cockpit/assets/components/field-layout.tag
@@ -538,6 +538,21 @@
                 return;
             }
 
+            if (def.options && def.options.preview) {
+
+                if (typeof(def.options.preview) == 'string') {
+
+                    try {
+                        def.options.preview = new Function('$v', '$c', '$def', `return \`${def.options.preview}\`;`);
+                    } catch(e) {
+                        console.warn(e);
+                        def.options.preview = null;
+                    }
+                }
+
+                return (def.options.preview && def.options.preview(component.settings || {}, component, def)) || '';
+            }
+
             if (['heading', 'button'].indexOf(component.component) > -1) {
                 return component.settings.text ? '<div class="uk-text-truncate">'+App.Utils.stripTags(component.settings.text)+'</div>':'';
             }