diff --git a/docs/src/demos/Marks/Underline/index.vue b/docs/src/demos/Marks/Underline/index.vue
index a1511948..21f41c91 100644
--- a/docs/src/demos/Marks/Underline/index.vue
+++ b/docs/src/demos/Marks/Underline/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.chain().focus().underline().run()" :class="{ 'is-active': editor.isActive('underline') }">
+    <button @click="editor.chain().focus().toggleUnderline().run()" :class="{ 'is-active': editor.isActive('underline') }">
       underline
     </button>
 
diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts
index 0f9cb39c..9ddd6b45 100644
--- a/packages/extension-underline/src/index.ts
+++ b/packages/extension-underline/src/index.ts
@@ -30,15 +30,30 @@ const Underline = Mark.create({
 
   addCommands() {
     return {
-      underline: (): Command => ({ commands }) => {
+      /**
+       * Set a underline mark
+       */
+      setUnderline: (): Command => ({ commands }) => {
+        return commands.addMark('underline')
+      },
+      /**
+       * Toggle a underline mark
+       */
+      toggleUnderline: (): Command => ({ commands }) => {
         return commands.toggleMark('underline')
       },
+      /**
+       * Set a underline mark
+       */
+      unsetUnderline: (): Command => ({ commands }) => {
+        return commands.addMark('underline')
+      },
     }
   },
 
   addKeyboardShortcuts() {
     return {
-      'Mod-u': () => this.editor.commands.underline(),
+      'Mod-u': () => this.editor.commands.toggleUnderline(),
     }
   },
 })