diff --git a/packages/tiptap-extensions/src/marks/Bold.js b/packages/tiptap-extensions/src/marks/Bold.js
index b982725a..a6dba903 100644
--- a/packages/tiptap-extensions/src/marks/Bold.js
+++ b/packages/tiptap-extensions/src/marks/Bold.js
@@ -38,7 +38,7 @@ export default class BoldMark extends Mark {
 
 	inputRules({ type }) {
 		return [
-			markInputRule(/\*\*([^*]+)\*\*$/, type),
+			markInputRule(/(?:\*\*|__)([^\*_]+)(?:\*\*|__)$/, type),
 		]
 	}
 
diff --git a/packages/tiptap-extensions/src/marks/Underline.js b/packages/tiptap-extensions/src/marks/Underline.js
index b0878dd9..f8a25c6f 100644
--- a/packages/tiptap-extensions/src/marks/Underline.js
+++ b/packages/tiptap-extensions/src/marks/Underline.js
@@ -1,5 +1,5 @@
 import { Mark } from 'tiptap'
-import { toggleMark, markInputRule } from 'tiptap-commands'
+import { toggleMark } from 'tiptap-commands'
 
 export default class UnderlineMark extends Mark {
 
@@ -32,10 +32,4 @@ export default class UnderlineMark extends Mark {
 		return toggleMark(type)
 	}
 
-	inputRules({ type }) {
-		return [
-			markInputRule(/__([^_]+)__$/, type),
-		]
-	}
-
 }