diff --git a/frontend/src/components/dirent-detail/dirent-details.js b/frontend/src/components/dirent-detail/dirent-details.js
index 6a8b436f80..2e2afaf70e 100644
--- a/frontend/src/components/dirent-detail/dirent-details.js
+++ b/frontend/src/components/dirent-detail/dirent-details.js
@@ -225,7 +225,7 @@ class DirentDetail extends React.Component {
             <TabPane tabId="comments" className="comments h-100">
               <DetailCommentList
                 repoID={this.props.repoID}
-                filePath={(dirent && dirent.type === 'file') ? path + '/' + dirent.name : path}
+                filePath={(dirent && dirent.type === 'file') ? Utils.joinPath(path, dirent.name) : path}
               />
             </TabPane>
           </TabContent>
diff --git a/frontend/src/css/wiki.css b/frontend/src/css/wiki.css
index d659170552..9da2de4245 100644
--- a/frontend/src/css/wiki.css
+++ b/frontend/src/css/wiki.css
@@ -39,6 +39,9 @@
 .wiki-pages-container .article {
   padding: 0 20px;
 }
+.wiki-pages-container .tree-view {
+  margin-top: 14px;
+}
 
 .wiki-md-viewer-rendered-content {
   padding: 30px 0 0;
diff --git a/frontend/src/pages/lib-content-view/lib-content-container.js b/frontend/src/pages/lib-content-view/lib-content-container.js
index d8e5ebba76..470c1c289d 100644
--- a/frontend/src/pages/lib-content-view/lib-content-container.js
+++ b/frontend/src/pages/lib-content-view/lib-content-container.js
@@ -143,7 +143,8 @@ class LibContentContainer extends React.Component {
   }
 
   checkCurrentDirent = (deletedDirent) => {
-    if (deletedDirent.name === this.state.currentDirent.name) {
+    let { currentDirent } = this.state;
+    if (currentDirent && deletedDirent.name === currentDirent.name) {
       this.setState({currentDirent: null});
     }
   }