diff --git a/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js b/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js
index 1633cff22b4..71f83805e8a 100644
--- a/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js
+++ b/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js
@@ -5,8 +5,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Modal, ModalVariant, Form, FormGroup, TextInput, ActionGroup, Button, Radio, TextArea,
-  Split, SplitItem, Select, SelectOption } from '@patternfly/react-core';
+import {
+  Modal, ModalVariant, Form, FormGroup, TextInput, ActionGroup, Button, Radio, TextArea,
+  Split, SplitItem, Select, SelectOption,
+} from '@patternfly/react-core';
 import { addCVFilterRule, createContentViewFilter } from '../../ContentViewDetailActions';
 import {
   selectCreateContentViewFilter, selectCreateContentViewFilterStatus,
@@ -16,7 +18,7 @@ import {
 import { FILTER_TYPES } from '../../../ContentViewsConstants';
 import ContentType from '../ContentType';
 
-const CVFilterAddModal = ({ cvId, show, setIsOpen }) => {
+const CVFilterAddModal = ({ cvId, show, onClose }) => {
   const [inclusion, setInclusion] = useState(true);
   const [name, setName] = useState('');
   const [description, setDescription] = useState('');
@@ -83,12 +85,10 @@ const CVFilterAddModal = ({ cvId, show, setIsOpen }) => {
       title={__('Create filter')}
       variant={ModalVariant.large}
       isOpen={show}
-      onClose={() => {
-        setIsOpen(false);
-      }}
+      onClose={onClose}
       appendTo={document.body}
     >
-      <Form>
+      <Form onSubmit={onSave}>
         <FormGroup label={__('Name')} isRequired fieldId="name">
           <TextInput
             isRequired
@@ -154,12 +154,12 @@ const CVFilterAddModal = ({ cvId, show, setIsOpen }) => {
           <Button
             aria-label="create_filter"
             variant="primary"
-            isDisabled={saving}
-            onClick={() => onSave()}
+            isDisabled={saving || name.length === 0}
+            type="submit"
           >
             {__('Create filter')}
           </Button>
-          <Button variant="link" onClick={() => setIsOpen(false)}>
+          <Button variant="link" onClick={onClose}>
             {__('Cancel')}
           </Button>
         </ActionGroup>
@@ -171,11 +171,11 @@ const CVFilterAddModal = ({ cvId, show, setIsOpen }) => {
 CVFilterAddModal.propTypes = {
   cvId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   show: PropTypes.bool.isRequired,
-  setIsOpen: PropTypes.func,
+  onClose: PropTypes.func,
 };
 
 CVFilterAddModal.defaultProps = {
-  setIsOpen: null,
+  onClose: null,
 };
 
 export default CVFilterAddModal;
diff --git a/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js b/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js
index 37ce52bc840..c94bfa9748e 100644
--- a/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js
+++ b/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js
@@ -33,7 +33,7 @@ test('Can save content view filter from form', (done) => {
   fireEvent.change(getByLabelText('input_name'), { target: { value: 'test' } });
   fireEvent.change(getByLabelText('input_description'), { target: { value: 'Creating filter' } });
 
-  getByLabelText('create_filter').click();
+  fireEvent.submit(getByLabelText('create_filter'));
   assertNockRequest(createFilterscope, done);
 });
 
@@ -45,7 +45,7 @@ test('Closes content view filter form upon save', async (done) => {
   fireEvent.change(getByLabelText('input_name'), { target: { value: 'test' } });
   fireEvent.change(getByLabelText('input_description'), { target: { value: 'Creating filter' } });
 
-  getByLabelText('create_filter').click();
+  fireEvent.submit(getByLabelText('create_filter'));
   await patientlyWaitFor(() => {
     expect(queryByText('Description')).not.toBeInTheDocument();
   });
diff --git a/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js b/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js
index 7c25fb47820..d003d903e7c 100644
--- a/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js
+++ b/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js
@@ -153,7 +153,7 @@ const ContentViewFilters = ({ cvId }) => {
             <CVFilterAddModal
               cvId={cvId}
               show={addModalOpen}
-              setIsOpen={setAddModalOpen}
+              onClose={() => setAddModalOpen(false)}
               aria-label="add_filter_modal"
             />}
         </>