diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index dc726ed96a..41f5a4c1be 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -395,7 +395,8 @@ class DirentListItem extends React.Component {
   render() {
     let { path, dirent } = this.props;
     let direntPath = Utils.joinPath(path, dirent.name);
-    let href = siteRoot + 'wiki/lib/' + this.props.repoID + Utils.encodePath(direntPath);
+    let dirHref = siteRoot + 'library/' + this.props.repoID + '/' + this.props.currentRepoInfo.repo_name + Utils.encodePath(direntPath);
+    let fileHref = siteRoot + 'lib/' + this.props.repoID + '/file' + Utils.encodePath(direntPath);
     let toolTipID = MD5(dirent.name).slice(0, 7);
     let tagTitle = '';
     if (dirent.file_tags && dirent.file_tags.length > 0) {
@@ -422,7 +423,7 @@ class DirentListItem extends React.Component {
           <td className="name">
             {this.state.isRenameing ?
               <DirentRename dirent={dirent} onRenameConfirm={this.onRenameConfirm} onRenameCancel={this.onRenameCancel}/> :
-              <a href={href} onClick={this.onItemClick}>{dirent.name}</a>
+              <a href={dirent.type === 'dir' ? dirHref : fileHref} onClick={this.onItemClick}>{dirent.name}</a>
             }
           </td>
           <td>
diff --git a/frontend/src/pages/share-admin/share-links.js b/frontend/src/pages/share-admin/share-links.js
index a2a4c93be7..b5b43e9f76 100644
--- a/frontend/src/pages/share-admin/share-links.js
+++ b/frontend/src/pages/share-admin/share-links.js
@@ -152,7 +152,12 @@ class Item extends Component {
     return (
       <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
         <td><img src={iconUrl} width="24" /></td>
-        <td><Link to={linkUrl}>{item.obj_name}</Link></td>
+        <td>
+          {item.is_dir ?
+            <Link to={linkUrl}>{item.obj_name}</Link> :
+            <a href={linkUrl} target="_blank">{item.obj_name}</a>
+          }
+        </td>
         <td><Link to={`${siteRoot}library/${item.repo_id}/${item.repo_name}/`}>{item.repo_name}</Link></td>
         <td>{item.view_cnt}</td>
         <td>{this.renderExpriedData()}</td>