diff --git a/frontend/src/metabase/components/FormField.jsx b/frontend/src/metabase/components/FormField.jsx
index fb884258f82948bca30d6fb07e4b022a93c692dc..3000b231d68f6f245a8dfec10905c3b07fd3d1e2 100644
--- a/frontend/src/metabase/components/FormField.jsx
+++ b/frontend/src/metabase/components/FormField.jsx
@@ -5,8 +5,10 @@ import cx from "classnames";
 export default class FormField extends Component {
     static propTypes = {
         // redux-form compatible:
-        error: PropTypes.object,
         name: PropTypes.string,
+        error: PropTypes.any,
+        visited: PropTypes.bool,
+        active: PropTypes.bool,
 
         displayName: PropTypes.string.isRequired,
 
@@ -16,7 +18,7 @@ export default class FormField extends Component {
     };
 
     getError() {
-        if (this.props.error) {
+        if (this.props.error && this.props.visited !== false && this.props.active !== true) {
             return this.props.error;
         }
 
diff --git a/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx b/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
index a24db8e0900a4340bb63df2191478600f20bd20c..f6a08a8de34f4a27eea73825fcb0dee7b921f3a1 100644
--- a/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
+++ b/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
@@ -14,7 +14,7 @@ import { reduxForm } from "redux-form";
     validate: (values) => {
         const errors = {};
         if (!values.name) {
-            errors.name = true;
+            errors.name = "Name is required";
         }
         if (!values.color) {
             errors.color = "Color is required";