diff --git a/exampleSite/content/shortcodes/highlight.en.md b/exampleSite/content/shortcodes/highlight.en.md
index 29c099a302..f1d41f7dad 100644
--- a/exampleSite/content/shortcodes/highlight.en.md
+++ b/exampleSite/content/shortcodes/highlight.en.md
@@ -80,7 +80,7 @@ print("Hello World!")
 | Name                  | Default          | Notes       |
 |-----------------------|------------------|-------------|
 | **type**              | _<empty>_  | The language of the code to highlight. Choose from one of the [supported languages](https://gohugo.io/content-management/syntax-highlighting/#list-of-chroma-highlighting-languages). Case-insensitive. |
-| **title**             | _<empty>_  | **Extension**. Arbitrary title for code. This displays the code like a [single tab]({{% relref "shortcodes/tab" %}}). |
+| **title**             | _<empty>_  | **Extension**. Arbitrary title for code. This displays the code like a [single tab]({{% relref "shortcodes/tab" %}}) if `hl_inline=false` (which is Hugos default). |
 | **wrap**              | see notes        | **Extension**. When `true` the content may wrap on long lines otherwise it will be scrollable.<br><br>The default value can be set in your `config.toml` and overwritten via frontmatter. [See below](#configuration). |
 | **options**           | _&lt;empty&gt;_  | An optional, comma-separated list of zero or more [Hugo supported options](https://gohugo.io/functions/highlight/#options) as well as extension parameter from this table. |
 | _**&lt;option&gt;**_  | _&lt;empty&gt;_  | Any of [Hugo's supported options](https://gohugo.io/functions/highlight/#options). |
diff --git a/layouts/partials/shortcodes/highlight.html b/layouts/partials/shortcodes/highlight.html
index 4b32d25967..a6f558bc8d 100644
--- a/layouts/partials/shortcodes/highlight.html
+++ b/layouts/partials/shortcodes/highlight.html
@@ -47,6 +47,15 @@
 {{- end }}
 {{- $options = $otherOptions }}
 {{- $attributes = $attributes | merge $otherAttributes }}
+{{- $hl_inline := false }}
+{{- if and (isset $page.Params "markup") (isset $page.Params.markup "highlight") (isset $page.Params.markup.highlight "hl_inline") }}
+  {{- $hl_inline = $page.Params.markup.highlight.hl_inline }}
+{{- end }}
+{{- range $k, $v := $options }}
+  {{- if eq $k "hl_inline" }}
+    {{- $hl_inline = $v }}
+  {{- end }}
+{{- end }}
 {{- $params := slice }}
 {{- range $k, $v := $options }}
   {{- $params = $params | append (printf "%s=%s" $k $v) }}
@@ -75,7 +84,7 @@
 {{- if $wrap }}
   {{- $content = replaceRE "^([\\s\\n\\r]*<div\\s+class=\")" "${1}wrap-code " $content 1 }}
 {{- end }}
-{{- if $title }}
+{{- if and $title (not $hl_inline) }}
   {{ partial "shortcodes/tab.html" (dict
     "page"  $page
     "title" $title