diff --git a/layouts/shortcodes/tabpane.html b/layouts/shortcodes/tabpane.html
index 4025e5c83c..953cbe9dca 100644
--- a/layouts/shortcodes/tabpane.html
+++ b/layouts/shortcodes/tabpane.html
@@ -141,7 +141,7 @@
         {{ if $text -}}
           {{ index . "content" -}}
         {{ else -}}
-          {{ highlight (trim (index . "content") "\n") $lang $hloptions -}}
+          {{ highlight (trim (index . "content") "\r\n") $lang $hloptions -}}
         {{ end }}
     </div>
 
diff --git a/userguide/content/en/docs/adding-content/shortcodes/index.md b/userguide/content/en/docs/adding-content/shortcodes/index.md
index 5c00557b9e..6459fda71d 100644
--- a/userguide/content/en/docs/adding-content/shortcodes/index.md
+++ b/userguide/content/en/docs/adding-content/shortcodes/index.md
@@ -331,7 +331,7 @@ in the response headers." you __CAN__ embed it, but when the test says "Great! X
 Sometimes it's very useful to have tabbed panes when authoring content. One common use-case is to show multiple syntax highlighted code blocks that showcase the same problem, and how to solve it in different programming languages. As an example, the tabbed pane below shows the language-specific variants of the famous `Hello world!` program one usually writes first when learning a new programming language:
 
 {{< tabpane langEqualsHeader=true >}}
-  {{< tab "C" >}}
+{{< tab "C" >}}
 #include <stdio.h>
 #include <stdlib.h>