diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index e37494a9..1de6d03c 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -46,7 +46,7 @@
       <button @click="editor.chain().focus().toggleOrderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
         ordered list
       </button>
-      <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+      <button @click="editor.chain().focus().toggleCodeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
         code block
       </button>
       <button @click="editor.chain().focus().toggleBlockquote().run()" :class="{ 'is-active': editor.isActive('blockquote') }">
diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index eb03cf0a..3d762d80 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -46,7 +46,7 @@
       <button @click="editor.chain().focus().toggleOrderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
         ordered list
       </button>
-      <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+      <button @click="editor.chain().focus().toggleCodeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
         code block
       </button>
       <button @click="editor.chain().focus().toggleBlockquote().run()" :class="{ 'is-active': editor.isActive('blockquote') }">
diff --git a/docs/src/demos/Examples/CollaborativeEditingWs/index.vue b/docs/src/demos/Examples/CollaborativeEditingWs/index.vue
index e186a45f..08c3f452 100644
--- a/docs/src/demos/Examples/CollaborativeEditingWs/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditingWs/index.vue
@@ -46,7 +46,7 @@
       <button @click="editor.chain().focus().toggleOrderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
         ordered list
       </button>
-      <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+      <button @click="editor.chain().focus().toggleCodeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
         code block
       </button>
       <button @click="editor.chain().focus().toggleBlockquote().run()" :class="{ 'is-active': editor.isActive('blockquote') }">
diff --git a/docs/src/demos/Nodes/CodeBlock/index.vue b/docs/src/demos/Nodes/CodeBlock/index.vue
index 4da9c34e..d80b9aa3 100644
--- a/docs/src/demos/Nodes/CodeBlock/index.vue
+++ b/docs/src/demos/Nodes/CodeBlock/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
+    <button @click="editor.chain().focus().toggleCodeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
       code block
     </button>
 
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
index 2d697e9d..d6bcc1b9 100644
--- a/packages/extension-code-block/src/index.ts
+++ b/packages/extension-code-block/src/index.ts
@@ -74,18 +74,24 @@ const CodeBlock = Node.create({
 
   addCommands() {
     return {
+      /**
+       * Set a code block
+       */
+      setCodeBlock: (attributes?: { language: string }): Command => ({ commands }) => {
+        return commands.setBlockType('codeBlock', attributes)
+      },
       /**
        * Toggle a code block
        */
-      codeBlock: (attrs?: CodeBlockOptions): Command => ({ commands }) => {
-        return commands.toggleBlockType('codeBlock', 'paragraph', attrs)
+      toggleCodeBlock: (attributes?: { language: string }): Command => ({ commands }) => {
+        return commands.toggleBlockType('codeBlock', 'paragraph', attributes)
       },
     }
   },
 
   addKeyboardShortcuts() {
     return {
-      'Mod-Shift-c': () => this.editor.commands.codeBlock(),
+      'Mod-Shift-c': () => this.editor.commands.toggleCodeBlock(),
     }
   },