diff --git a/ui/src/pages/PeopleManagePage/AttributesEditor/NewRow.js b/ui/src/pages/PeopleManagePage/AttributesEditor/NewRow.js
index a590a89596..2f41a59bc6 100644
--- a/ui/src/pages/PeopleManagePage/AttributesEditor/NewRow.js
+++ b/ui/src/pages/PeopleManagePage/AttributesEditor/NewRow.js
@@ -51,7 +51,7 @@ const render = ({
           onSubmit={handleAdd} />
       </TableData>
       <TableActionsData>
-        <AddIconButton onClick={handleAdd} />
+        <AddIconButton onClick={handleAdd} disabled={!(attributeKey.length && attributeValue.length)} />
         <CancelIconButton onClick={onCancel} />
       </TableActionsData>
     </tr>