diff --git a/src/components/ScrollPane/index.vue b/src/components/ScrollPane/index.vue
index d4d75aee1fb7a2cd535b9877613c2e9ebc59d603..89998e8015503d27eba1923db42602973118281b 100644
--- a/src/components/ScrollPane/index.vue
+++ b/src/components/ScrollPane/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-const padding = 15 // tag's padding
+const tagAndTagSpacing = 4 // tagAndTagSpacing
 
 export default {
   name: 'ScrollPane',
@@ -20,18 +20,54 @@ export default {
       const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
       $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
     },
-    moveToTarget($target) {
+    moveToTarget(currentTag) {
       const $container = this.$refs.scrollContainer.$el
       const $containerWidth = $container.offsetWidth
       const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
-      const $targetLeft = $target.offsetLeft
-      const $targetWidth = $target.offsetWidth
-      if ($targetLeft > $containerWidth) {
-        // tag in the right
-        $scrollWrapper.scrollLeft = $targetLeft - $containerWidth + $targetWidth + padding
+      const tagList = this.$parent.$refs.tag
+
+      let firstTag = null
+      let lastTag = null
+      let prevTag = null
+      let nextTag = null
+
+      // find first tag and last tag
+      if (tagList.length > 0) {
+        firstTag = tagList[0]
+        lastTag = tagList[tagList.length - 1]
+      }
+
+      // find preTag and nextTag
+      for (let i = 0; i < tagList.length; i++) {
+        if (tagList[i] === currentTag) {
+          if (i === 0) {
+            nextTag = tagList[i].length > 1 && tagList[i + 1]
+          } else if (i === tagList.length - 1) {
+            prevTag = tagList[i].length > 1 && tagList[i - 1]
+          } else {
+            prevTag = tagList[i - 1]
+            nextTag = tagList[i + 1]
+          }
+          break
+        }
+      }
+
+      if (firstTag === currentTag) {
+        $scrollWrapper.scrollLeft = 0
+      } else if (lastTag === currentTag) {
+        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
       } else {
-        // tag in the left
-        $scrollWrapper.scrollLeft = $targetLeft - padding
+        // the tag's offsetLeft after of nextTag
+        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
+
+        // the tag's offsetLeft before of prevTag
+        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
+
+        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
+          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
+        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
+          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
+        }
       }
     }
   }
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 6d878e6a10a6cd50c8c9d8e589f3f453b8a36254..0aa1c8957dd7ca187a0b21df287fa8aed0bc2bc3 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -75,8 +75,8 @@ export default {
       const tags = this.$refs.tag
       this.$nextTick(() => {
         for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag.$el)
+          if (tag.to === this.$route.fullPath) {
+            this.$refs.scrollPane.moveToTarget(tag)
 
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {