diff --git a/.env.local b/.env.local
index 8b04d2c7..48bf046f 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.6.0
\ No newline at end of file
+NEXT_PUBLIC_VERSION=3.6.1
\ No newline at end of file
diff --git a/components/PrismMac.js b/components/PrismMac.js
index 2ec44618..1aab0ddc 100644
--- a/components/PrismMac.js
+++ b/components/PrismMac.js
@@ -55,33 +55,18 @@ function renderPrismMac() {
     })
   }
 
-  setTimeout(() => {
-    // Add pre-mac element for Mac Style UI
-    if (codeToolBars) {
-      Array.from(codeToolBars).forEach(item => {
-        const existPreMac = item.getElementsByClassName('pre-mac')
-        if (existPreMac.length < codeToolBars.length) {
-          const preMac = document.createElement('div')
-          preMac.classList.add('pre-mac')
-          preMac.innerHTML = '<span></span><span></span><span></span>'
-          item?.appendChild(preMac, item)
-        }
-      })
-    }
-  }, 10)
-
   //   支持 Mermaid
   const mermaids = document.querySelectorAll('.notion-code .language-mermaid')
   if (mermaids) {
     for (const e of mermaids) {
-      e.parentElement.parentElement.classList.remove('code-toolbar')
+      e.parentElement.classList.remove('code-toolbar')
       const chart = e.firstChild.textContent
       if (e.firstElementChild) {
-        e.parentElement.parentElement.remove()
+        e.parentElement.remove()
         continue
       }
       if (chart) {
-        e.parentElement.parentElement.innerHTML = `<div class="mermaid">${chart}</div>`
+        e.parentElement.innerHTML = `<div class="mermaid">${chart}</div>`
       }
     }
   }
@@ -102,6 +87,19 @@ function renderPrismMac() {
   } catch (err) {
     console.log('代码渲染', err)
   }
+
+  // Add pre-mac element for Mac Style UI
+  if (codeToolBars) {
+    Array.from(codeToolBars).forEach(item => {
+      const existPreMac = item.getElementsByClassName('pre-mac')
+      if (existPreMac.length < codeToolBars.length) {
+        const preMac = document.createElement('div')
+        preMac.classList.add('pre-mac')
+        preMac.innerHTML = '<span></span><span></span><span></span>'
+        item?.appendChild(preMac, item)
+      }
+    })
+  }
 }
 
 export default PrismMac
diff --git a/package.json b/package.json
index bed8a9a4..d111033e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {
diff --git a/pages/[...slug].js b/pages/[...slug].js
index 64f3f113..63eb5e51 100644
--- a/pages/[...slug].js
+++ b/pages/[...slug].js
@@ -21,7 +21,7 @@ const Slug = props => {
   const router = Router.useRouter()
 
   // 文章锁🔐
-  const [lock, setLock] = React.useState(true)
+  const [lock, setLock] = React.useState(post?.password && post?.password !== '')
 
   React.useEffect(() => {
     if (post?.password && post?.password !== '') {
diff --git a/styles/prism-mac-style.css b/styles/prism-mac-style.css
index 8efcf150..9f2c5098 100644
--- a/styles/prism-mac-style.css
+++ b/styles/prism-mac-style.css
@@ -67,4 +67,9 @@ pre[class*='language-'] {
 
 .notion-code-copy{
   display: none;
+}
+
+pre[class*="language-mermaid"] {
+  background: transparent !important; 
+  @apply dark:bg-gray-200 !important;
 }
\ No newline at end of file