diff --git a/frontend/src/components/dir-view/dir-panel.js b/frontend/src/components/dir-view/dir-panel.js
index a30260b89d..13d46be508 100644
--- a/frontend/src/components/dir-view/dir-panel.js
+++ b/frontend/src/components/dir-view/dir-panel.js
@@ -176,15 +176,6 @@ class DirPanel extends React.Component {
                   onTabNavClick={this.props.onTabNavClick}
                 />
               </div>
-              {(this.props.usedRepoTags.length > 0 && this.props.path === '/') && (
-                <div className="tags-summary-bar">
-                  <FileTagsViewer
-                    repoID={this.props.repoID}
-                    currentPath={this.props.path}
-                    usedRepoTags={this.props.usedRepoTags}
-                  />
-                </div>
-              )}
               <div className="cur-view-content">
                 {this.props.errorMsg ?
                  <p className="error text-center">{this.props.errorMsg}</p> :
@@ -192,6 +183,15 @@ class DirPanel extends React.Component {
                     {!this.props.pathExist ?
                       errMessage :
                       <Fragment>
+                        {(this.props.usedRepoTags.length > 0 && this.props.path === '/') && (
+                          <div className="tags-summary-bar">
+                            <FileTagsViewer
+                              repoID={this.props.repoID}
+                              currentPath={this.props.path}
+                              usedRepoTags={this.props.usedRepoTags}
+                            />
+                          </div>
+                        )}
                         <DirentListView
                           path={this.props.path}
                           repoID={this.props.repoID}
diff --git a/frontend/src/css/repo-tag.css b/frontend/src/css/repo-tag.css
index 94f68b5fdb..5dcf7c7d25 100644
--- a/frontend/src/css/repo-tag.css
+++ b/frontend/src/css/repo-tag.css
@@ -95,7 +95,7 @@
 }
 
 .tags-summary-bar {
-  margin: 16px 16px 4px;
+  margin-bottom: 5px;
   padding: 0 10px;
   border: 1px solid #e6e6dd;
   border-radius: 5px;