diff --git a/docs/src/demos/Examples/CodeBlockLanguage/CodeBlock.vue b/docs/src/demos/Examples/CodeBlockLanguage/CodeBlock.vue
new file mode 100644
index 00000000..1d0916f5
--- /dev/null
+++ b/docs/src/demos/Examples/CodeBlockLanguage/CodeBlock.vue
@@ -0,0 +1,55 @@
+<template>
+  <node-view-wrapper class="code-block" as="pre">
+    <select class="code-block-select" v-model="selectedLanguage">
+      <option v-for="(language, index) in languages" :value="language" :key="index">
+        {{ language }}
+      </option>
+      <option :value="null">
+        auto
+      </option>
+    </select>
+    <node-view-content as="code" />
+  </node-view-wrapper>
+</template>
+
+<script>
+import { NodeViewWrapper, NodeViewContent, nodeViewProps } from '@tiptap/vue-2'
+
+export default {
+  components: {
+    NodeViewWrapper,
+    NodeViewContent,
+  },
+
+  props: nodeViewProps,
+
+  computed: {
+    selectedLanguage: {
+      get() {
+        return this.node.attrs.language
+      },
+      set(language) {
+        this.updateAttributes({ language })
+      }
+    }
+  },
+
+  data() {
+    return {
+      languages: ['js', 'css'],
+    }
+  },
+}
+</script>
+
+<style>
+.code-block {
+  position: relative;
+}
+
+.code-block-select {
+  position: absolute;
+  top: 0.5rem;
+  right: 0.5rem;
+}
+</style>
diff --git a/docs/src/demos/Examples/CodeBlockLanguage/index.vue b/docs/src/demos/Examples/CodeBlockLanguage/index.vue
new file mode 100644
index 00000000..a5a5bd03
--- /dev/null
+++ b/docs/src/demos/Examples/CodeBlockLanguage/index.vue
@@ -0,0 +1,155 @@
+<template>
+  <div v-if="editor">
+    <button @click="editor.chain().focus().toggleCodeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+      code block
+    </button>
+
+    <editor-content :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor, EditorContent, VueNodeViewRenderer } from '@tiptap/vue-2'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
+
+import javascript from 'highlight.js/lib/languages/javascript'
+import css from 'highlight.js/lib/languages/css'
+
+import CodeBlock from './CodeBlock'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.editor = new Editor({
+      extensions: [
+        Document,
+        Paragraph,
+        Text,
+        CodeBlockLowlight
+          .extend({
+            addNodeView() {
+              return VueNodeViewRenderer(CodeBlock)
+            },
+          })
+          .configure({
+            languages: {
+              javascript,
+              css,
+            },
+          }),
+      ],
+      content: `
+        <p>
+          That’s a boring paragraph followed by a fenced code block:
+        </p>
+        <pre><code>for (var i=1; i <= 20; i++)
+{
+  if (i % 15 == 0)
+    console.log("FizzBuzz");
+  else if (i % 3 == 0)
+    console.log("Fizz");
+  else if (i % 5 == 0)
+    console.log("Buzz");
+  else
+    console.log(i);
+}</code></pre>
+        <p>
+          Press Command/Ctrl + Enter to leave the fenced code block and continue typing in boring paragraphs.
+        </p>
+      `,
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
+
+<style lang="scss">
+/* Basic editor styles */
+.ProseMirror {
+  > * + * {
+    margin-top: 0.75em;
+  }
+
+  pre {
+    background: #0D0D0D;
+    color: #FFF;
+    font-family: 'JetBrainsMono', monospace;
+    padding: 0.75rem 1rem;
+    border-radius: 0.5rem;
+
+    code {
+      color: inherit;
+      padding: 0;
+      background: none;
+      font-size: 0.8rem;
+    }
+
+    .hljs-comment,
+    .hljs-quote {
+      color: #616161;
+    }
+
+    .hljs-variable,
+    .hljs-template-variable,
+    .hljs-attribute,
+    .hljs-tag,
+    .hljs-name,
+    .hljs-regexp,
+    .hljs-link,
+    .hljs-name,
+    .hljs-selector-id,
+    .hljs-selector-class {
+      color: #F98181;
+    }
+
+    .hljs-number,
+    .hljs-meta,
+    .hljs-built_in,
+    .hljs-builtin-name,
+    .hljs-literal,
+    .hljs-type,
+    .hljs-params {
+      color: #FBBC88;
+    }
+
+    .hljs-string,
+    .hljs-symbol,
+    .hljs-bullet {
+      color: #B9F18D;
+    }
+
+    .hljs-title,
+    .hljs-section {
+      color: #FAF594;
+    }
+
+    .hljs-keyword,
+    .hljs-selector-tag {
+      color: #70CFF8;
+    }
+
+    .hljs-emphasis {
+      font-style: italic;
+    }
+
+    .hljs-strong {
+      font-weight: 700;
+    }
+  }
+}
+</style>
diff --git a/docs/src/docPages/examples/code-block-language.md b/docs/src/docPages/examples/code-block-language.md
new file mode 100644
index 00000000..bdac1b35
--- /dev/null
+++ b/docs/src/docPages/examples/code-block-language.md
@@ -0,0 +1,3 @@
+# Code block language
+
+<demo name="Examples/CodeBlockLanguage" />
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 1993ebf7..0dd877e0 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -76,6 +76,9 @@
       link: /examples/savvy
     - title: Interactivity
       link: /examples/interactivity
+    - title: Code block language
+      link: /examples/code-block-language
+      type: new
 
 - title: Guide
   items: