diff --git a/package.json b/package.json
index e7024dbdb..abb149879 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "photoswipe": "^5.2.8",
         "postcss": "^8.4.5",
         "quill": "^1.3.7",
-        "quill-mention-hi": "^3.1.0-2",
+        "quill-mention-hi": "^3.1.0-3",
         "resolve-url-loader": "^4.0.0",
         "sass": "~1.32.13",
         "sass-loader": "^12.6.0",
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index a94750d2d..9ddbd808c 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -1328,7 +1328,9 @@ export default {
                 return;
             }
             if (textType === "text") {
-                textBody = textBody.replace(/<\/span> <\/p>$/, "</span></p>")
+                textBody = textBody
+                    .replace(/<\/span> <\/p>$/, "</span></p>")
+                    .replace(/(<span\s+class="mention"(.*?)>.*?<\/span>.*?<\/span>.*?<\/span>)(\x20)?/, "$1 ")
             }
             //
             if (this.quoteUpdate) {
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 71e8f557b..9588481f3 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -399,7 +399,7 @@ body.window-portrait {
                 height: 100%;
                 z-index: 1;
                 > ul {
-                    padding: 20px 0;
+                    padding: 0 0 20px;
                     > li {
                         position: relative;
                         padding: 0 32px;