diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index 092c8648..61e1121c 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -37,6 +37,11 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
             let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(headerModel, delegateObject() as? MVMCoreUIDelegateObject, false) else {
             return  super.viewForTop()
         }
+        
+        // Temporary, Default the horizontal padding
+        if var container = templateModel?.header as? ContainerModelProtocol, container.useHorizontalMargins == nil {
+            container.useHorizontalMargins = true
+        }
         return molecule
     }