diff --git a/modules/markup/html_codepreview.go b/modules/markup/html_codepreview.go
index cfef2f9ab0d39..fe01578bdc7db 100644
--- a/modules/markup/html_codepreview.go
+++ b/modules/markup/html_codepreview.go
@@ -61,6 +61,10 @@ func renderCodeBlock(ctx *RenderContext, node *html.Node) (urlPosStart, urlPosSt
 
 func codePreviewPatternProcessor(ctx *RenderContext, node *html.Node) {
 	for node != nil {
+		if node.Type != html.TextNode {
+			node = node.NextSibling
+			continue
+		}
 		urlPosStart, urlPosEnd, h, err := renderCodeBlock(ctx, node)
 		if err != nil || h == "" {
 			if err != nil {
diff --git a/web_src/css/markup/codepreview.css b/web_src/css/markup/codepreview.css
index 15890dba54f8b..a8540ee0842f7 100644
--- a/web_src/css/markup/codepreview.css
+++ b/web_src/css/markup/codepreview.css
@@ -1,5 +1,6 @@
 .markup .code-preview-container {
   border: 1px solid var(--color-secondary);
+  border-radius: var(--border-radius);
   margin: 0.25em 0;
 }
 
@@ -13,6 +14,7 @@
   width: 100%;
   max-height: 100px;
   overflow-y: auto;
+  margin: 0; /* override ".markup table {margin}" */
 }
 
 /* override the polluted styles from the content.css: ".markup table ..." */