diff --git a/frontend/src/pages/sys-admin/repos/all-repos.js b/frontend/src/pages/sys-admin/repos/all-repos.js
index fc53826893..a8e26b0862 100644
--- a/frontend/src/pages/sys-admin/repos/all-repos.js
+++ b/frontend/src/pages/sys-admin/repos/all-repos.js
@@ -114,13 +114,13 @@ class AllRepos extends Component {
 
   getSearch = () => {
     return <Search
-      placeholder={gettext('Search libraries by name')}
+      placeholder={gettext('Search libraries by name or ID')}
       submit={this.searchRepos}
     />;
   }
 
-  searchRepos = (repoName) => {
-    navigate(`${siteRoot}sys/search-libraries/?name=${encodeURIComponent(repoName)}`);
+  searchRepos = (repoNameOrID) => {
+    navigate(`${siteRoot}sys/search-libraries/?name_or_id=${encodeURIComponent(repoNameOrID)}`);
   }
 
   render() {
diff --git a/frontend/src/pages/sys-admin/repos/search-repos.js b/frontend/src/pages/sys-admin/repos/search-repos.js
index 6b1a87fce6..24ecef2afc 100644
--- a/frontend/src/pages/sys-admin/repos/search-repos.js
+++ b/frontend/src/pages/sys-admin/repos/search-repos.js
@@ -23,7 +23,7 @@ class SearchRepos extends Component {
   componentDidMount() {
     let params = (new URL(document.location)).searchParams;
     this.setState({
-      name: params.get('name') || ''
+      name: params.get('name_or_id') || ''
     }, this.getRepos);
   }
 
@@ -90,10 +90,10 @@ class SearchRepos extends Component {
             <div className="cur-view-content">
               <div className="mt-4 mb-6">
                 <h4 className="border-bottom font-weight-normal mb-2 pb-1">{gettext('Search Libraries')}</h4>
-                <p className="text-secondary small">{gettext('Tip: you can search by keyword in name.')}</p>
+                <p className="text-secondary small">{gettext('Tip: you can search by keyword in name or ID.')}</p>
                 <Form>
                   <FormGroup row>
-                    <Label for="name" sm={1}>{gettext('Name')}</Label>
+                    <Label for="name" sm={1}>{gettext('Name or ID')}</Label>
                     <Col sm={5}>
                       <Input type="text" name="name" id="name" value={name} onChange={this.handleNameInputChange} />
                     </Col>
diff --git a/frontend/src/pages/sys-admin/search.js b/frontend/src/pages/sys-admin/search.js
index abeeb54ca8..b0823badd8 100644
--- a/frontend/src/pages/sys-admin/search.js
+++ b/frontend/src/pages/sys-admin/search.js
@@ -43,7 +43,7 @@ class Search extends React.Component {
         <input
           type="text"
           className="form-control search-input h-6 mr-1"
-          style={{width: '15rem'}}
+          style={{width: '17rem'}}
           placeholder={this.props.placeholder}
           value={this.state.value}
           onChange={this.handleInputChange}
diff --git a/seahub/api2/endpoints/admin/libraries.py b/seahub/api2/endpoints/admin/libraries.py
index 16e5e7ecc2..c4b11d1461 100644
--- a/seahub/api2/endpoints/admin/libraries.py
+++ b/seahub/api2/endpoints/admin/libraries.py
@@ -482,7 +482,7 @@ class AdminSearchLibrary(APIView):
     permission_classes = (IsAdminUser,)
 
     def get(self, request, format=None):
-        """ Search library by name.
+        """ Search library by name or id.
 
         Permission checking:
         1. only admin can perform this action.
@@ -497,6 +497,7 @@ class AdminSearchLibrary(APIView):
             return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
 
         repos = seafile_api.search_repos_by_name(query_str)
+        repos += seafile_api.get_repos_by_id_prefix(query_str)
 
         default_repo_id = get_system_default_repo_id()
         repos = [r for r in repos if not r.is_virtual]