diff --git a/frontend/src/components/dialog/list-taggedfiles-dialog.js b/frontend/src/components/dialog/list-taggedfiles-dialog.js
index 8e86845418..07f11b5cce 100644
--- a/frontend/src/components/dialog/list-taggedfiles-dialog.js
+++ b/frontend/src/components/dialog/list-taggedfiles-dialog.js
@@ -61,12 +61,7 @@ class ListTaggedFilesDialog extends React.Component {
             <tbody>
               {taggedFileList.map((taggedFile, index) => {
                 let path = Utils.joinPath(taggedFile.parent_path, taggedFile.filename);
-                let href = '';
-                if (Utils.isMarkdownFile(path)) {
-                  href = siteRoot + 'wiki/lib/' + this.props.repoID + Utils.encodePath(path);
-                } else {
-                  href = siteRoot + 'lib/' + this.props.repoID + '/file' + Utils.encodePath(path);
-                }
+                let href = siteRoot + 'lib/' + this.props.repoID + '/file' + Utils.encodePath(path);
                 return (
                   <tr key={index}>
                     <td className="name">
diff --git a/frontend/src/pages/wiki/main-panel.js b/frontend/src/pages/wiki/main-panel.js
index 85cf9b5919..577e47194a 100644
--- a/frontend/src/pages/wiki/main-panel.js
+++ b/frontend/src/pages/wiki/main-panel.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { gettext, repoID, slug, siteRoot } from '../../utils/constants';
 import CommonToolbar from '../../components/toolbar/common-toolbar';
@@ -82,26 +82,32 @@ class MainPanel extends Component {
     return (
       <div className="main-panel wiki-main-panel o-hidden">
         <div className="main-panel-top panel-top">
-          <div className="cur-view-toolbar border-left-show">
-            <span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span>
-            { 
-              this.props.permission === 'rw' && 
-              <button className="btn btn-secondary operation-item" title="Edit File" onClick={this.onEditClick}>{gettext('Edit Page')}</button>
-            }
-          </div>
           {loginUser &&
-            <CommonToolbar 
-              repoID={repoID}
-              onSearchedClick={this.props.onSearchedClick} 
-              searchPlaceholder={gettext('Search files in this library')}
-            />
+            <Fragment>
+              <div className="cur-view-toolbar border-left-show">
+                <span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span>
+                { 
+                  this.props.permission === 'rw' && 
+                  <button className="btn btn-secondary operation-item" title="Edit File" onClick={this.onEditClick}>{gettext('Edit Page')}</button>
+                }
+              </div>
+              <CommonToolbar 
+                repoID={repoID}
+                onSearchedClick={this.props.onSearchedClick} 
+                searchPlaceholder={gettext('Search files in this library')}
+              />
+            </Fragment>
           }
         </div>
         <div className="cur-view-container">
           <div className="cur-view-path">
             <div className="path-containter">
-              <a href={siteRoot + 'wikis/'} className="normal">{gettext('Wikis')}</a>
-              <span className="path-split">/</span>
+              {loginUser &&
+                <Fragment>
+                  <a href={siteRoot + 'wikis/'} className="normal">{gettext('Wikis')}</a>
+                  <span className="path-split">/</span>
+                </Fragment>
+              }
               <a href={siteRoot + 'wikis/' + slug} className="normal">{slug}</a>
               {pathElem}
             </div>
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index 2b3b1eb7e0..80f07ff2e6 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -787,6 +787,7 @@ a.sf-popover-item:hover {
     border-bottom: 1px solid #e8e8e8;
     display:flex;
     flex-shrink:0;
+    min-height: 49px;
 }
 
 /* top logo */