diff --git a/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx b/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
index 0fcc17ea8..f87f50299 100644
--- a/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
@@ -133,7 +133,7 @@ const MessageContainer: React.FC<
             )}
           </div>
 
-          <MessageToolbar message={props} />
+          {editMessage !== props.id && <MessageToolbar message={props} />}
         </div>
         <div
           className={twMerge(
diff --git a/web/styles/components/marked.scss b/web/styles/components/marked.scss
index f20d69dcc..792b7c00f 100644
--- a/web/styles/components/marked.scss
+++ b/web/styles/components/marked.scss
@@ -94,15 +94,12 @@
 .markdown-content {
   ol,
   ul {
+    list-style: auto;
     padding-left: 16px;
+    white-space: normal;
+    list-style-position: inside;
     li {
       line-height: 2;
     }
   }
-  ol {
-    list-style: number;
-  }
-  ul {
-    list-style: disc;
-  }
 }