diff --git a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
index 99d4df0b..89e60568 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
@@ -18,7 +18,9 @@ export default class ControlPane extends React.Component {
     if (!wrappedControl) return;
     const name = field.get('name');
     const widget = field.get('widget');
-    if (widget === 'list' || widget === 'object') {
+    const listFields = field => field.get('field') || field.get('fields') || field.get('types');
+
+    if ((widget === 'list' && listFields(field)) || widget === 'object') {
       this.componentValidate[name] = wrappedControl.innerWrappedControl.validate;
     } else {
       this.componentValidate[name] = wrappedControl.validate;