diff --git a/app/src/protyle/render/highlightRender.ts b/app/src/protyle/render/highlightRender.ts
index 5a264d8fc..cc2341bd6 100644
--- a/app/src/protyle/render/highlightRender.ts
+++ b/app/src/protyle/render/highlightRender.ts
@@ -14,7 +14,7 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) =
             // bazaar reademe
             codeElements = element.querySelectorAll("pre code");
             codeElements.forEach(item => {
-                item.parentElement.setAttribute("lineNumber", "false");
+                item.parentElement.setAttribute("linenumber", "false");
             });
         } else if (element.classList.contains("b3-typography")) {
             // preview & export html markdown
@@ -94,10 +94,12 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) =
                         block.firstElementChild.className = "protyle-linenumber__rows";
                         block.firstElementChild.setAttribute("contenteditable", "false");
                         lineNumberRender(block);
+                        block.style.display = "";
                     } else {
                         block.firstElementChild.className = "fn__none";
                         block.firstElementChild.innerHTML = "";
                         hljsElement.style.paddingLeft = "";
+                        block.style.display = "block";
                     }
                 }
                 hljsElement.innerHTML = window.hljs.highlight(
@@ -162,4 +164,16 @@ box-sizing: border-box;position: absolute;padding-top:0 !important;padding-botto
 
     lineNumberTemp.remove();
     block.firstElementChild.innerHTML = lineNumberHTML;
+    // https://github.com/siyuan-note/siyuan/issues/12726
+    if (block.scrollHeight > block.clientHeight) {
+        if (getSelection().rangeCount > 0) {
+            const range = getSelection().getRangeAt(0);
+            if (block.contains(range.startContainer)) {
+                const brElement = document.createElement("br");
+                range.insertNode(brElement);
+                brElement.scrollIntoView({block: "nearest"});
+                brElement.remove();
+            }
+        }
+    }
 };
diff --git a/app/src/protyle/wysiwyg/enter.ts b/app/src/protyle/wysiwyg/enter.ts
index 6ae834406..1c7a2f7b1 100644
--- a/app/src/protyle/wysiwyg/enter.ts
+++ b/app/src/protyle/wysiwyg/enter.ts
@@ -120,6 +120,7 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle
         editableElement.parentElement.removeAttribute("data-render");
         highlightRender(blockElement);
         updateTransaction(protyle, blockElement.getAttribute("data-node-id"), blockElement.outerHTML, oldHTML);
+        scrollCenter(protyle);
         return true;
     }