diff --git a/changes/issue-1620-team-modal-hit-enter b/changes/issue-1620-team-modal-hit-enter
new file mode 100644
index 0000000000..8d95a3b783
--- /dev/null
+++ b/changes/issue-1620-team-modal-hit-enter
@@ -0,0 +1 @@
+* Can hit enter to add team or edit team
\ No newline at end of file
diff --git a/cypress/integration/all/app/labelflow.spec.ts b/cypress/integration/all/app/labelflow.spec.ts
index 5b23996417..6c760cea56 100644
--- a/cypress/integration/all/app/labelflow.spec.ts
+++ b/cypress/integration/all/app/labelflow.spec.ts
@@ -65,7 +65,7 @@ describe(
       // delete custom label
       cy.get(".manage-hosts__label-block button").last().click();
 
-      cy.wait(2000); // eslint-disable-line cypress/no-unnecessary-waiting
+      cy.wait(3000); // eslint-disable-line cypress/no-unnecessary-waiting
       cy.get(".manage-hosts__modal-buttons > .button--alert")
         .contains("button", /delete/i)
         .click();
diff --git a/frontend/pages/admin/TeamManagementPage/components/EditTeamModal/EditTeamModal.tsx b/frontend/pages/admin/TeamManagementPage/components/EditTeamModal/EditTeamModal.tsx
index 7ba7f308ae..7b4360d87b 100644
--- a/frontend/pages/admin/TeamManagementPage/components/EditTeamModal/EditTeamModal.tsx
+++ b/frontend/pages/admin/TeamManagementPage/components/EditTeamModal/EditTeamModal.tsx
@@ -37,7 +37,7 @@ const EditTeamModal = (props: IEditTeamModalProps): JSX.Element => {
 
   return (
     <Modal title={"Edit team"} onExit={onCancel} className={baseClass}>
-      <form className={`${baseClass}__form`}>
+      <form className={`${baseClass}__form`} onSubmit={onFormSubmit}>
         <InputFieldWithIcon
           autofocus
           // error={errors.name}
@@ -47,12 +47,7 @@ const EditTeamModal = (props: IEditTeamModalProps): JSX.Element => {
           value={name}
         />
         <div className={`${baseClass}__btn-wrap`}>
-          <Button
-            className={`${baseClass}__btn`}
-            type="button"
-            variant="brand"
-            onClick={onFormSubmit}
-          >
+          <Button className={`${baseClass}__btn`} type="submit" variant="brand">
             Save
           </Button>
           <Button