diff --git a/frontend/src/components/search/search.js b/frontend/src/components/search/search.js
index fdaa420c59..41fe50bf66 100644
--- a/frontend/src/components/search/search.js
+++ b/frontend/src/components/search/search.js
@@ -100,7 +100,7 @@ class Search extends Component {
     let isPublic = this.props.isPublic;
 
     if (isPublic) {
-      seafileAPI.searchFilesInPublishedRepo(queryData.q, queryData.search_repo).then(res => {
+      seafileAPI.searchFilesInPublishedRepo(queryData.search_repo, queryData.q).then(res => {
         if (!res.data.total) {
           _this.setState({
             resultItems: [],
diff --git a/frontend/src/pages/wiki/main-panel.js b/frontend/src/pages/wiki/main-panel.js
index 59d7e07672..7d9596cd35 100644
--- a/frontend/src/pages/wiki/main-panel.js
+++ b/frontend/src/pages/wiki/main-panel.js
@@ -1,12 +1,13 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { gettext, repoID, slug, siteRoot, username } from '../../utils/constants';
-import CommonToolbar from '../../components/toolbar/common-toolbar';
+import { gettext, repoID, slug, siteRoot, username, isPro } from '../../utils/constants';
 import WikiMarkdownViewer from '../../components/wiki-markdown-viewer';
 import WikiDirListView from '../../components/wiki-dir-list-view/wiki-dir-list-view';
 import Loading from '../../components/loading';
 import { Utils } from '../../utils/utils';
 import Search from '../../components/search/search';
+import Notification from '../../components/common/notification';
+import Account from '../../components/common/account';
 
 const propTypes = {
   path: PropTypes.string.isRequired,
@@ -76,6 +77,8 @@ class MainPanel extends Component {
 
 
   render() {
+    let { onSearchedClick, permission } = this.props;
+    let searchPlaceholder = gettext('Search files in this library');
     const errMessage = (<div className="message err-tip">{gettext('Folder does not exist.')}</div>);
     return (
       <div className="main-panel wiki-main-panel o-hidden">
@@ -86,12 +89,9 @@ class MainPanel extends Component {
                 <span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span>
               </div>
               <div className="common-toolbar">
-                <Search
-                  isPublic={true}
-                  repoID={repoID}
-                  onSearchedClick={this.props.onSearchedClick}
-                  placeholder={gettext('Search files in this library')}
-                />
+                {isPro && (
+                  <Search isPublic={true} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={searchPlaceholder}/>
+                )}
               </div>
             </Fragment>
           }
@@ -105,11 +105,13 @@ class MainPanel extends Component {
                     <span className="fa fa-pencil-alt mobile-toolbar-icon" title={gettext('Edit')} onClick={this.onEditClick} style={{'font-size': '1.1rem'}}></span>
                 )}
               </div>
-              <CommonToolbar 
-                repoID={repoID}
-                onSearchedClick={this.props.onSearchedClick} 
-                searchPlaceholder={gettext('Search files in this library')}
-              />
+              <div className="common-toolbar">
+                {isPro && (
+                  <Search isPublic={permission !== 'rw' && permission !== 'r'} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={searchPlaceholder}/>
+                )}
+                <Notification />
+                <Account />
+              </div>
             </Fragment>
           )}
         </div>