diff --git a/frontend/src/pages/org-admin/index.js b/frontend/src/pages/org-admin/index.js
index 83711b75a6..af3d949776 100644
--- a/frontend/src/pages/org-admin/index.js
+++ b/frontend/src/pages/org-admin/index.js
@@ -10,6 +10,7 @@ import OrgUserProfile from './org-user-profile';
 import OrgUserRepos from './org-user-repos';
 import OrgUserSharedRepos from './org-user-shared-repos';
 import OrgGroups from './org-groups';
+import OrgGroupsSearchGroups from './org-groups-search-groups';
 import OrgGroupInfo from './org-group-info';
 import OrgGroupRepos from './org-group-repos';
 import OrgGroupMembers from './org-group-members';
@@ -75,6 +76,7 @@ class Org extends React.Component {
             <OrgUserRepos path={siteRoot + 'org/useradmin/info/:email/repos/'} />
             <OrgUserSharedRepos path={siteRoot + 'org/useradmin/info/:email/shared-repos/'} />
             <OrgGroups path={siteRoot + 'org/groupadmin'} />
+            <OrgGroupsSearchGroups path={siteRoot + 'org/groupadmin/search-groups'} />
             <OrgGroupInfo path={siteRoot + 'org/groupadmin/:groupID/'} />
             <OrgGroupRepos path={siteRoot + 'org/groupadmin/:groupID/repos/'} />
             <OrgGroupMembers path={siteRoot + 'org/groupadmin/:groupID/members/'} />
diff --git a/frontend/src/pages/org-admin/org-groups-search-groups.js b/frontend/src/pages/org-admin/org-groups-search-groups.js
new file mode 100644
index 0000000000..a7e6cd9b7c
--- /dev/null
+++ b/frontend/src/pages/org-admin/org-groups-search-groups.js
@@ -0,0 +1,279 @@
+import React, { Component, Fragment } from 'react';
+import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
+import { Button, Form, FormGroup, Input, Col } from 'reactstrap';
+import { Utils } from '../../utils/utils';
+import { seafileAPI } from '../../utils/seafile-api';
+import { gettext, orgID, siteRoot } from '../../utils/constants';
+import toaster from '../../components/toast';
+import OrgGroupInfo from '../../models/org-group';
+
+class GroupItem extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      highlight: false,
+      showMenu: false,
+      isItemMenuShow: false
+    };
+  }
+
+  onMouseEnter = () => {
+    if (!this.props.isItemFreezed) {
+      this.setState({
+        showMenu: true,
+        highlight: true,
+      });
+    }
+  }
+
+  onMouseLeave = () => {
+    if (!this.props.isItemFreezed) {
+      this.setState({
+        showMenu: false,
+        highlight: false
+      });
+    }
+  }
+
+  onDropdownToggleClick = (e) => {
+    e.preventDefault();
+    this.toggleOperationMenu(e);
+  }
+
+  toggleOperationMenu = (e) => {
+    e.stopPropagation();
+    this.setState(
+      {isItemMenuShow: !this.state.isItemMenuShow }, () => {
+        if (this.state.isItemMenuShow) {
+          this.props.onFreezedItem();
+        } else {
+          this.setState({
+            highlight: false,
+            showMenu: false,
+          });
+          this.props.onUnfreezedItem();
+        }
+      }
+    );
+  }
+
+  toggleDelete = () => {
+    this.props.deleteGroupItem(this.props.group);
+  }
+
+  renderGroupHref = (group) => {
+    let groupInfoHref;
+    if (group.creatorName == 'system admin') {
+      groupInfoHref = siteRoot + 'org/departmentadmin/groups/' + group.id + '/';
+    } else {
+      groupInfoHref = siteRoot + 'org/groupadmin/' + group.id + '/';
+    }
+
+    return groupInfoHref;
+  }
+
+  renderGroupCreator = (group) => {
+    let userInfoHref = siteRoot + 'org/useradmin/info/' + group.creatorEmail + '/';
+    if (group.creatorName == 'system admin') {
+      return (
+        <td> -- </td>
+      );
+    } else {
+      return(
+        <td>
+          <a href={userInfoHref} className="font-weight-normal">{group.creatorName}</a>
+        </td>
+      );
+    }
+  }
+
+  render() {
+    let { group } = this.props;
+    let isOperationMenuShow = (group.creatorName != 'system admin') && this.state.showMenu;
+    return (
+      <tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
+        <td>
+          <a href={this.renderGroupHref(group)} className="font-weight-normal">{group.groupName}</a>
+        </td>
+        {this.renderGroupCreator(group)}
+        <td>{group.ctime}</td>
+        <td className="text-center cursor-pointer">
+          {isOperationMenuShow &&
+            <Dropdown isOpen={this.state.isItemMenuShow} toggle={this.toggleOperationMenu}>
+              <DropdownToggle
+                tag="a"
+                className="attr-action-icon fas fa-ellipsis-v"
+                title={gettext('More Operations')}
+                data-toggle="dropdown"
+                aria-expanded={this.state.isItemMenuShow}
+                onClick={this.onDropdownToggleClick}
+              />
+              <DropdownMenu>
+                <DropdownItem onClick={this.toggleDelete}>{gettext('Delete')}</DropdownItem>
+              </DropdownMenu>
+            </Dropdown>
+          }
+        </td>
+      </tr>
+    );
+  }
+}
+
+
+class OrgGroupsSearchGroupsResult extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      isItemFreezed: false
+    };
+  }
+
+  onFreezedItem = () => {
+    this.setState({isItemFreezed: true});
+  }
+
+  onUnfreezedItem = () => {
+    this.setState({isItemFreezed: false});
+  }
+
+  render() {
+    let { orgGroups } = this.props;
+    return (
+      <div className="cur-view-content">
+        <table>
+          <thead>
+            <tr>
+              <th width="30%">{gettext('Name')}</th>
+              <th width="35%">{gettext('Creator')}</th>
+              <th width="23%">{gettext('Created At')}</th>
+              <th width="12%" className="text-center">{gettext('Operations')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {orgGroups.map(item => {
+              return (
+                <GroupItem
+                  key={item.id}
+                  group={item}
+                  isItemFreezed={this.state.isItemFreezed}
+                  onFreezedItem={this.onFreezedItem}
+                  onUnfreezedItem={this.onUnfreezedItem}
+                  deleteGroupItem={this.props.toggleDelete}
+                />
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+}
+
+class OrgGroupsSearchGroups extends Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      query: '',
+      orgGroups: [],
+      isSubmitBtnActive: false,
+      loading: true,
+      errorMsg: '',
+    };
+  }
+
+  componentDidMount () {
+    let params = (new URL(document.location)).searchParams;
+    this.setState({
+      query: params.get('query') || '',
+    }, () => {this.getItems();});
+  }
+
+  getItems = () => {
+    seafileAPI.orgAdminSearchGroup(orgID, this.state.query.trim()).then(res => {
+      let groupList = res.data.group_list.map(item => {
+        return new OrgGroupInfo(item);
+      });
+      this.setState({
+        orgGroups: groupList,
+        loading: false,
+      });
+    }).catch((error) => {
+      this.setState({
+        loading: false,
+        errorMsg: Utils.getErrorMsg(error, true) // true: show login tip if 403
+      });
+    });
+  }
+
+  deleteGroupItem = (group) => {
+    seafileAPI.orgAdminDeleteOrgGroup(orgID, group.id).then(res => {
+      this.setState({
+        orgGroups: this.state.orgGroups.filter(item => item.id != group.id)
+      });
+      let msg = gettext('Successfully deleted {name}');
+      msg = msg.replace('{name}', group.groupName);
+      toaster.success(msg);
+    }).catch(error => {
+      let errMessage = Utils.getErrorMsg(error);
+      toaster.danger(errMessage);
+    });
+  }
+
+  handleInputChange = (e) => {
+    this.setState({
+      query: e.target.value
+    }, this.checkSubmitBtnActive);
+  }
+
+  checkSubmitBtnActive = () => {
+    const { query } = this.state;
+    this.setState({
+      isSubmitBtnActive: query.trim()
+    });
+  }
+
+  render() {
+    const { query, isSubmitBtnActive } = this.state;
+
+    return (
+      <Fragment>
+        <div className="main-panel-center flex-row">
+          <div className="cur-view-container">
+            <div className="cur-view-path">
+              <h3 className="sf-heading">{gettext('Groups')}</h3>
+            </div>
+            <div className="cur-view-content">
+              <div className="mt-4 mb-6">
+                <h4 className="border-bottom font-weight-normal mb-2 pb-1">{gettext('Search Groups')}</h4>
+                <Form>
+                  <FormGroup row>
+                    <Col sm={5}>
+                      <Input type="text" name="query" value={query} placeholder={gettext('Search groups')} onChange={this.handleInputChange} />
+                    </Col>
+                  </FormGroup>
+                  <FormGroup row>
+                    <Col sm={{size: 5}}>
+                      <button className="btn btn-outline-primary" disabled={!isSubmitBtnActive} onClick={this.getItems}>{gettext('Submit')}</button>
+                    </Col>
+                  </FormGroup>
+                </Form>
+              </div>
+              <div className="mt-4 mb-6">
+                <h4 className="border-bottom font-weight-normal mb-2 pb-1">{gettext('Result')}</h4>
+                <OrgGroupsSearchGroupsResult
+                  toggleDelete={this.deleteGroupItem}
+                  orgGroups={this.state.orgGroups}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </Fragment>
+    );
+  }
+}
+
+export default OrgGroupsSearchGroups;
diff --git a/frontend/src/pages/org-admin/org-groups.js b/frontend/src/pages/org-admin/org-groups.js
index 82f635e053..a07d871c59 100644
--- a/frontend/src/pages/org-admin/org-groups.js
+++ b/frontend/src/pages/org-admin/org-groups.js
@@ -1,4 +1,5 @@
 import React, { Component, Fragment } from 'react';
+import { navigate } from '@reach/router';
 import PropTypes from 'prop-types';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import { siteRoot, gettext, orgID } from '../../utils/constants';
@@ -8,6 +9,55 @@ import toaster from '../../components/toast';
 import OrgGroupInfo from '../../models/org-group';
 import MainPanelTopbar from './main-panel-topbar';
 
+class Search extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: ''
+    };
+  }
+
+  handleInputChange = (e) => {
+    this.setState({
+      value: e.target.value
+    });
+  }
+
+  handleKeyPress = (e) => {
+    if (e.key == 'Enter') {
+      e.preventDefault();
+      this.handleSubmit();
+    }
+  }
+
+  handleSubmit = () => {
+    const value = this.state.value.trim();
+    if (!value) {
+      return false;
+    }
+    this.props.submit(value);
+  }
+
+  render() {
+    return (
+      <div className="input-icon">
+        <i className="d-flex input-icon-addon fas fa-search"></i>
+        <input
+          type="text"
+          className="form-control search-input h-6 mr-1"
+          style={{width: '15rem'}}
+          placeholder={this.props.placeholder}
+          value={this.state.value}
+          onChange={this.handleInputChange}
+          onKeyPress={this.handleKeyPress}
+          autoComplete="off"
+        />
+      </div>
+    );
+  }
+}
+
 class OrgGroups extends Component {
 
   constructor(props) {
@@ -77,11 +127,22 @@ class OrgGroups extends Component {
     });
   }
 
+  searchItems = (keyword) => {
+    navigate(`${siteRoot}org/groupadmin/search-groups/?query=${encodeURIComponent(keyword)}`);
+  }
+
+  getSearch = () => {
+    return <Search
+      placeholder={gettext('Search groups by name')}
+      submit={this.searchItems}
+    />;
+  }
+
   render() {
     let groups = this.state.orgGroups;
     return (
       <Fragment>
-        <MainPanelTopbar/>
+        <MainPanelTopbar search={this.getSearch()}/>
         <div className="main-panel-center flex-row">
           <div className="cur-view-container">
             <div className="cur-view-path">
diff --git a/frontend/src/pages/org-admin/org-users-search-users.js b/frontend/src/pages/org-admin/org-users-search-users.js
index 03c860345d..85a7370038 100644
--- a/frontend/src/pages/org-admin/org-users-search-users.js
+++ b/frontend/src/pages/org-admin/org-users-search-users.js
@@ -82,7 +82,7 @@ class OrgUsersSearchUsers extends Component {
   }
 
   getItems = () => {
-    seafileAPI.orgAdminSearchUser(1, this.state.query.trim()).then(res => {
+    seafileAPI.orgAdminSearchUser(orgID, this.state.query.trim()).then(res => {
       let userList = res.data.user_list.map(item => {
         return new OrgUserInfo(item);
       });