diff --git a/frontend/src/components/dialog/create-department-repo-dialog.js b/frontend/src/components/dialog/create-department-repo-dialog.js
index 6864ddab599..86a4265de7a 100644
--- a/frontend/src/components/dialog/create-department-repo-dialog.js
+++ b/frontend/src/components/dialog/create-department-repo-dialog.js
@@ -38,7 +38,7 @@ class CreateDepartmentRepoDialog extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -81,7 +81,7 @@ class CreateDepartmentRepoDialog extends React.Component {
               <Label for="repo-name">{gettext('Name')}</Label>
               <Input
                 id="repo-name"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.repoName}
                 onChange={this.handleChange}
                 maxLength={maxFileName}
diff --git a/frontend/src/components/dialog/create-file-dialog.js b/frontend/src/components/dialog/create-file-dialog.js
index 01a08af2bab..560da08cdc9 100644
--- a/frontend/src/components/dialog/create-file-dialog.js
+++ b/frontend/src/components/dialog/create-file-dialog.js
@@ -67,7 +67,7 @@ class CreateFile extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -151,7 +151,7 @@ class CreateFile extends React.Component {
               <Label for="fileName">{gettext('Name')}</Label>
               <Input
                 id="fileName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 innerRef={this.newInput}
                 value={this.state.childName}
                 onChange={this.handleChange}
diff --git a/frontend/src/components/dialog/create-folder-dialog.js b/frontend/src/components/dialog/create-folder-dialog.js
index d53c3e5b735..c9c1f645262 100644
--- a/frontend/src/components/dialog/create-folder-dialog.js
+++ b/frontend/src/components/dialog/create-folder-dialog.js
@@ -60,7 +60,7 @@ class CreateForder extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -87,7 +87,7 @@ class CreateForder extends React.Component {
               <Input
                 id="folderName"
                 value={this.state.childName}
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 onChange={this.handleChange}
                 autoFocus={true}
               />
diff --git a/frontend/src/components/dialog/create-repo-dialog.js b/frontend/src/components/dialog/create-repo-dialog.js
index 1d1e74b0e1f..691e1a3b407 100644
--- a/frontend/src/components/dialog/create-repo-dialog.js
+++ b/frontend/src/components/dialog/create-repo-dialog.js
@@ -57,7 +57,7 @@ class CreateRepoDialog extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -180,7 +180,7 @@ class CreateRepoDialog extends React.Component {
               <Label for="repoName">{gettext('Name')}</Label>
               <Input
                 id="repoName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.repoName}
                 onChange={this.handleRepoNameChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/create-tag-dialog.js b/frontend/src/components/dialog/create-tag-dialog.js
index 5107288e99d..7770fea52b1 100644
--- a/frontend/src/components/dialog/create-tag-dialog.js
+++ b/frontend/src/components/dialog/create-tag-dialog.js
@@ -59,7 +59,7 @@ class CreateTagDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.createTag();
     }
@@ -77,7 +77,7 @@ class CreateTagDialog extends React.Component {
           <div role="form" className="tag-create">
             <div className="form-group">
               <label className="form-label">{gettext('Name')}</label>
-              <Input onKeyPress={this.handleKeyPress} autoFocus={true} value={this.state.tagName} onChange={this.inputNewName}/>
+              <Input onKeyDown={this.handleKeyDown} autoFocus={true} value={this.state.tagName} onChange={this.inputNewName}/>
               <div className="mt-2"><span className="error">{this.state.errorMsg}</span></div>
             </div>
             <div className="form-group">
diff --git a/frontend/src/components/dialog/lib-decrypt-dialog.js b/frontend/src/components/dialog/lib-decrypt-dialog.js
index edd7482ace2..fd011396177 100644
--- a/frontend/src/components/dialog/lib-decrypt-dialog.js
+++ b/frontend/src/components/dialog/lib-decrypt-dialog.js
@@ -35,7 +35,7 @@ class LibDecryptDialog extends React.Component {
     e.preventDefault();
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit(e);
     }
@@ -63,7 +63,7 @@ class LibDecryptDialog extends React.Component {
             {this.state.showError &&
               <p className="error">{gettext('Wrong password')}</p>
             }
-            <input type="password" name="password" className="form-control password-input" autoComplete="off" onKeyPress={this.handleKeyPress} placeholder={gettext('Password')} onChange={this.handleChange} />
+            <input type="password" name="password" className="form-control password-input" autoComplete="off" onKeyDown={this.handleKeyDown} placeholder={gettext('Password')} onChange={this.handleChange} />
             <button type="submit" className="btn btn-primary submit" onClick={this.handleSubmit}>{gettext('Submit')}</button>
             <p className="tip">{'* '}{gettext('The password will be kept in the server for only 1 hour.')}</p>
           </Form>
diff --git a/frontend/src/components/dialog/lib-history-setting-dialog.js b/frontend/src/components/dialog/lib-history-setting-dialog.js
index d16b56547fe..2361a503716 100644
--- a/frontend/src/components/dialog/lib-history-setting-dialog.js
+++ b/frontend/src/components/dialog/lib-history-setting-dialog.js
@@ -68,7 +68,7 @@ class LibHistorySetting extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.submit();
       e.preventDefault();
@@ -139,7 +139,7 @@ class LibHistorySetting extends React.Component {
                 value={this.state.expireDays}
                 onChange={this.onChange}
                 disabled={this.state.disabled}
-                onKeyDown={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
               />{' '}
               <Label><span>{gettext('days')}</span></Label>
             </FormGroup>
diff --git a/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js b/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
index 72923f5b96d..3ba5c939375 100644
--- a/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
+++ b/frontend/src/components/dialog/lib-old-files-auto-del-dialog.js
@@ -65,7 +65,7 @@ class LibOldFilesAutoDelDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.submit();
       e.preventDefault();
@@ -112,7 +112,7 @@ class LibOldFilesAutoDelDialog extends React.Component {
                 value={this.state.autoDelDays}
                 disabled={!this.state.isAutoDel}
                 onChange={this.onChange}
-                onKeyDown={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
               />{' '}
               <Label><span>{gettext('days')}</span></Label>
             </FormGroup>
diff --git a/frontend/src/components/dialog/new-wiki-dialog.js b/frontend/src/components/dialog/new-wiki-dialog.js
index 1f8d251b587..d8fb4313947 100644
--- a/frontend/src/components/dialog/new-wiki-dialog.js
+++ b/frontend/src/components/dialog/new-wiki-dialog.js
@@ -32,7 +32,7 @@ class NewWikiDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
     }
@@ -54,7 +54,7 @@ class NewWikiDialog extends React.Component {
         <ModalHeader toggle={this.toggle}>{gettext('New Wiki')}</ModalHeader>
         <ModalBody>
           <label className="form-label">{gettext('Name')}</label>
-          <Input onKeyPress={this.handleKeyPress} autoFocus={true} value={this.state.name} onChange={this.inputNewName}/>
+          <Input onKeyDown={this.handleKeyDown} autoFocus={true} value={this.state.name} onChange={this.inputNewName}/>
         </ModalBody>
         <ModalFooter>
           <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
diff --git a/frontend/src/components/dialog/org-add-department-dialog.js b/frontend/src/components/dialog/org-add-department-dialog.js
index 751e9b3f728..93d0ea8ee64 100644
--- a/frontend/src/components/dialog/org-add-department-dialog.js
+++ b/frontend/src/components/dialog/org-add-department-dialog.js
@@ -55,7 +55,7 @@ class AddDepartDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -73,7 +73,7 @@ class AddDepartDialog extends React.Component {
               <Label for="departName">{gettext('Name')}</Label>
               <Input
                 id="departName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.departName}
                 onChange={this.handleChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/org-add-repo-dialog.js b/frontend/src/components/dialog/org-add-repo-dialog.js
index 86c0f16af97..135033f21c2 100644
--- a/frontend/src/components/dialog/org-add-repo-dialog.js
+++ b/frontend/src/components/dialog/org-add-repo-dialog.js
@@ -51,7 +51,7 @@ class AddRepoDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -68,7 +68,7 @@ class AddRepoDialog extends React.Component {
               <Label for="repoName">{gettext('Name')}</Label>
               <Input
                 id="repoName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.repoName}
                 onChange={this.handleChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/org-add-user-dialog.js b/frontend/src/components/dialog/org-add-user-dialog.js
index a68b3ac85ef..16a497501dc 100644
--- a/frontend/src/components/dialog/org-add-user-dialog.js
+++ b/frontend/src/components/dialog/org-add-user-dialog.js
@@ -34,13 +34,6 @@ class AddOrgUserDialog extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
-    e.preventDefault();
-    if (e.key == 'Enter') {
-      this.handleSubmit(e);
-    }
-  };
-
   togglePasswordVisible = () => {
     this.setState({isPasswordVisible: !this.state.isPasswordVisible}, () => {
       if (this.state.isPasswordVisible) {
diff --git a/frontend/src/components/dialog/org-rename-department-dialog.js b/frontend/src/components/dialog/org-rename-department-dialog.js
index 64322ca0b6a..6de29d5aa32 100644
--- a/frontend/src/components/dialog/org-rename-department-dialog.js
+++ b/frontend/src/components/dialog/org-rename-department-dialog.js
@@ -63,7 +63,7 @@ class RenameDepartmentDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -87,7 +87,7 @@ class RenameDepartmentDialog extends React.Component {
               <Label for="departmentName">{gettext('Name')}</Label>
               <Input
                 id="departmentName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.departmentName}
                 onChange={this.handleChange}
                 innerRef={this.newInput}
diff --git a/frontend/src/components/dialog/org-set-group-quota-dialog.js b/frontend/src/components/dialog/org-set-group-quota-dialog.js
index 2e34d513da7..6005e9161e5 100644
--- a/frontend/src/components/dialog/org-set-group-quota-dialog.js
+++ b/frontend/src/components/dialog/org-set-group-quota-dialog.js
@@ -46,7 +46,7 @@ class SetGroupQuotaDialog extends React.Component {
     this.setState({ quota: quota });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.setGroupQuota();
       e.preventDefault();
@@ -60,7 +60,7 @@ class SetGroupQuotaDialog extends React.Component {
         <ModalBody>
           <InputGroup>
             <Input
-              onKeyPress={this.handleKeyPress}
+              onKeyDown={this.handleKeyDown}
               value={this.state.quota}
               onChange={this.handleChange}
               autoFocus={true}
diff --git a/frontend/src/components/dialog/rename-dialog.js b/frontend/src/components/dialog/rename-dialog.js
index 93b4ad1df20..0421dfb89f4 100644
--- a/frontend/src/components/dialog/rename-dialog.js
+++ b/frontend/src/components/dialog/rename-dialog.js
@@ -62,7 +62,7 @@ class Rename extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
     }
@@ -121,7 +121,7 @@ class Rename extends React.Component {
         <ModalHeader toggle={this.toggle}>{type === 'file' ? gettext('Rename File') : gettext('Rename Folder') }</ModalHeader>
         <ModalBody>
           <p>{type === 'file' ? gettext('New file name'): gettext('New folder name')}</p>
-          <Input onKeyPress={this.handleKeyPress} innerRef={this.newInput} placeholder="newName" value={this.state.newName} onChange={this.handleChange} />
+          <Input onKeyDown={this.handleKeyDown} innerRef={this.newInput} placeholder="newName" value={this.state.newName} onChange={this.handleChange} />
           {this.state.errMessage && <Alert color="danger" className="mt-2">{this.state.errMessage}</Alert>}
         </ModalBody>
         <ModalFooter>
diff --git a/frontend/src/components/dialog/rename-dirent.js b/frontend/src/components/dialog/rename-dirent.js
index 61a45cb2982..865994b90b2 100644
--- a/frontend/src/components/dialog/rename-dirent.js
+++ b/frontend/src/components/dialog/rename-dirent.js
@@ -63,7 +63,7 @@ class Rename extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
     }
@@ -123,7 +123,7 @@ class Rename extends React.Component {
         <ModalHeader toggle={this.toggle}>{type === 'file' ? gettext('Rename File') : gettext('Rename Folder') }</ModalHeader>
         <ModalBody>
           <p>{type === 'file' ? gettext('New file name'): gettext('New folder name')}</p>
-          <Input onKeyPress={this.handleKeyPress} innerRef={this.newInput} value={this.state.newName} onChange={this.handleChange} />
+          <Input onKeyDown={this.handleKeyDown} innerRef={this.newInput} value={this.state.newName} onChange={this.handleChange} />
           {this.state.errMessage && <Alert color="danger" className="mt-2">{this.state.errMessage}</Alert>}
         </ModalBody>
         <ModalFooter>
diff --git a/frontend/src/components/dialog/sysadmin-dialog/set-quota.js b/frontend/src/components/dialog/sysadmin-dialog/set-quota.js
index cd08cea927d..5be4f0c6ea1 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/set-quota.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/set-quota.js
@@ -30,7 +30,7 @@ class SetQuotaDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -55,7 +55,7 @@ class SetQuotaDialog extends React.Component {
                   type="text"
                   className="form-control"
                   value={quota}
-                  onKeyPress={this.handleKeyPress}
+                  onKeyDown={this.handleKeyDown}
                   onChange={this.handleQuotaChange}
                 />
                 <InputGroupAddon addonType="append">
diff --git a/frontend/src/components/dialog/sysadmin-dialog/set-upload-download-rate-limit.js b/frontend/src/components/dialog/sysadmin-dialog/set-upload-download-rate-limit.js
index 22b09a78bd2..88b0ec4a732 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/set-upload-download-rate-limit.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/set-upload-download-rate-limit.js
@@ -31,7 +31,7 @@ class SysAdminSetUploadDownloadRateLimitDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -56,7 +56,7 @@ class SysAdminSetUploadDownloadRateLimitDialog extends React.Component {
                   type="text"
                   className="form-control"
                   value={rateLimit}
-                  onKeyPress={this.handleKeyPress}
+                  onKeyDown={this.handleKeyDown}
                   onChange={this.handleRateLimitChange}
                 />
                 <InputGroupAddon addonType="append">
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-department-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-department-dialog.js
index 769000d3d58..b2c843439b5 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-department-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-department-dialog.js
@@ -55,7 +55,7 @@ class AddDepartDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -73,7 +73,7 @@ class AddDepartDialog extends React.Component {
               <Label for="departName">{gettext('Name')}</Label>
               <Input
                 id="departName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.departName}
                 onChange={this.handleChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-repo-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-repo-dialog.js
index f1a7e1e7370..3735c50b554 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-repo-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-add-repo-dialog.js
@@ -51,7 +51,7 @@ class AddRepoDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -68,7 +68,7 @@ class AddRepoDialog extends React.Component {
               <Label for="repoName">{gettext('Name')}</Label>
               <Input
                 id="repoName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.repoName}
                 onChange={this.handleChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-batch-add-admin-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-batch-add-admin-dialog.js
index 899c7514dc9..6d461b9b5d9 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-batch-add-admin-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-batch-add-admin-dialog.js
@@ -34,13 +34,6 @@ class SysAdminBatchAddAdminDialog extends React.Component {
     this.toggle();
   };
 
-  handleKeyPress = (e) => {
-    if (e.key === 'Enter') {
-      this.handleSubmit();
-      e.preventDefault();
-    }
-  };
-
   render() {
     return (
       <Modal isOpen={true} toggle={this.toggle}>
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-group-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-group-dialog.js
index fcf78ff7989..41ca3d2a74f 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-group-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-group-dialog.js
@@ -44,7 +44,7 @@ class SysAdminCreateGroupDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -65,7 +65,7 @@ class SysAdminCreateGroupDialog extends React.Component {
               <Label for="groupName">{gettext('Name')}</Label>
               <Input
                 id="groupName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.groupName}
                 onChange={this.handleRepoNameChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-repo-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-repo-dialog.js
index 9f26c5decf9..d66bee2003f 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-repo-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-create-repo-dialog.js
@@ -42,7 +42,7 @@ class SysAdminCreateRepoDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -63,7 +63,7 @@ class SysAdminCreateRepoDialog extends React.Component {
               <Label for="repoName">{gettext('Name')}</Label>
               <Input
                 id="repoName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.repoName}
                 onChange={this.handleRepoNameChange}
                 autoFocus={true}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js
index d4c1fb4e23b..4c0c8a00bd2 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-lib-history-setting-dialog.js
@@ -68,7 +68,7 @@ class SysAdminLibHistorySettingDialog extends React.Component {
     }
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.submit();
       e.preventDefault();
@@ -132,7 +132,7 @@ class SysAdminLibHistorySettingDialog extends React.Component {
                 value={this.state.expireDays}
                 onChange={this.onChange}
                 disabled={this.state.disabled}
-                onKeyDown={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
               />{' '}
               <Label><span>{gettext('days')}</span></Label>
             </FormGroup>
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-rename-department-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-rename-department-dialog.js
index ccf21d8c0d8..ef521fcb4b3 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-rename-department-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-rename-department-dialog.js
@@ -58,7 +58,7 @@ class RenameDepartmentDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -82,7 +82,7 @@ class RenameDepartmentDialog extends React.Component {
               <Label for="departmentName">{gettext('Name')}</Label>
               <Input
                 id="departmentName"
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 value={this.state.departmentName}
                 onChange={this.handleChange}
                 innerRef={this.newInput}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-group-quota-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-group-quota-dialog.js
index f20213d8b39..ad3a8e6faf5 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-group-quota-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-group-quota-dialog.js
@@ -46,7 +46,7 @@ class SetGroupQuotaDialog extends React.Component {
     this.setState({ quota: quota });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key === 'Enter') {
       this.setGroupQuota();
       e.preventDefault();
@@ -60,7 +60,7 @@ class SetGroupQuotaDialog extends React.Component {
         <ModalBody>
           <InputGroup>
             <Input
-              onKeyPress={this.handleKeyPress}
+              onKeyDown={this.handleKeyDown}
               value={this.state.quota}
               onChange={this.handleChange}
               autoFocus={true}
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-max-user-number-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-max-user-number-dialog.js
index 3723d98aa95..bcadace27bc 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-max-user-number-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-max-user-number-dialog.js
@@ -31,7 +31,7 @@ class SysAdminSetOrgMaxUserNumberDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -55,7 +55,7 @@ class SysAdminSetOrgMaxUserNumberDialog extends React.Component {
                 type="text"
                 className="form-control"
                 value={value}
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 onChange={this.handleInputChange}
               />
             </FormGroup>
diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-name-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-name-dialog.js
index 4a9ad650cd6..ed2c98bb763 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-name-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-set-org-name-dialog.js
@@ -31,7 +31,7 @@ class SysAdminSetOrgNameDialog extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -54,7 +54,7 @@ class SysAdminSetOrgNameDialog extends React.Component {
               <Input
                 type="text"
                 value={name}
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 onChange={this.handleInputChange}
               />
             </FormGroup>
diff --git a/frontend/src/components/dialog/sysadmin-dialog/update-user.js b/frontend/src/components/dialog/sysadmin-dialog/update-user.js
index bbabd40b9e8..438da85998d 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/update-user.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/update-user.js
@@ -27,7 +27,7 @@ class UpdateUser extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       this.handleSubmit();
       e.preventDefault();
@@ -50,7 +50,7 @@ class UpdateUser extends React.Component {
               <Input
                 type="text"
                 value={this.state.value}
-                onKeyPress={this.handleKeyPress}
+                onKeyDown={this.handleKeyDown}
                 onChange={this.handleInputChange}
               />
             </FormGroup>
diff --git a/frontend/src/pages/org-admin/org-groups.js b/frontend/src/pages/org-admin/org-groups.js
index 1c4fa30760c..583a7f87cd1 100644
--- a/frontend/src/pages/org-admin/org-groups.js
+++ b/frontend/src/pages/org-admin/org-groups.js
@@ -24,7 +24,7 @@ class Search extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       e.preventDefault();
       this.handleSubmit();
@@ -50,7 +50,7 @@ class Search extends React.Component {
           placeholder={this.props.placeholder}
           value={this.state.value}
           onChange={this.handleInputChange}
-          onKeyPress={this.handleKeyPress}
+          onKeyDown={this.handleKeyDown}
           autoComplete="off"
         />
       </div>
diff --git a/frontend/src/pages/org-admin/org-users-users.js b/frontend/src/pages/org-admin/org-users-users.js
index 9f17e1756bf..5aa35138528 100644
--- a/frontend/src/pages/org-admin/org-users-users.js
+++ b/frontend/src/pages/org-admin/org-users-users.js
@@ -29,7 +29,7 @@ class Search extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       e.preventDefault();
       this.handleSubmit();
@@ -55,7 +55,7 @@ class Search extends React.Component {
           placeholder={this.props.placeholder}
           value={this.state.value}
           onChange={this.handleInputChange}
-          onKeyPress={this.handleKeyPress}
+          onKeyDown={this.handleKeyDown}
           autoComplete="off"
         />
       </div>
diff --git a/frontend/src/pages/sys-admin/search.js b/frontend/src/pages/sys-admin/search.js
index a651c75520d..a97b52e7c72 100644
--- a/frontend/src/pages/sys-admin/search.js
+++ b/frontend/src/pages/sys-admin/search.js
@@ -21,7 +21,7 @@ class Search extends React.Component {
     });
   };
 
-  handleKeyPress = (e) => {
+  handleKeyDown = (e) => {
     if (e.key == 'Enter') {
       e.preventDefault();
       this.handleSubmit();
@@ -47,7 +47,7 @@ class Search extends React.Component {
           placeholder={this.props.placeholder}
           value={this.state.value}
           onChange={this.handleInputChange}
-          onKeyPress={this.handleKeyPress}
+          onKeyDown={this.handleKeyDown}
           autoComplete="off"
         />
       </div>