diff --git a/packages/text/src/nodes/codeblock.ts b/packages/text/src/nodes/codeblock.ts
index 21d874ceae..e5dca0fa9c 100644
--- a/packages/text/src/nodes/codeblock.ts
+++ b/packages/text/src/nodes/codeblock.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { isActive, textblockTypeInputRule } from '@tiptap/core'
+import { textblockTypeInputRule } from '@tiptap/core'
 import CodeBlock, { CodeBlockOptions } from '@tiptap/extension-code-block'
 
 export const codeBlockOptions: CodeBlockOptions = {
@@ -37,57 +37,6 @@ export const backtickInputRegex = /^```$/
 export const tildeInputRegex = /^~~~$/
 
 export const CodeBlockExtension = CodeBlock.extend({
-  addCommands () {
-    return {
-      setCodeBlock:
-        (attributes) =>
-          ({ commands }) => {
-            return commands.setNode(this.name, attributes)
-          },
-      toggleCodeBlock:
-        (attributes) =>
-          ({ chain, commands, state }) => {
-            const { from, to } = state.selection
-
-            // merge multiple paragraphs into codeblock
-            if (!isActive(state, this.name) && !state.selection.empty) {
-              let hasParagraphsOnlySelected = true
-              const textArr: string[] = []
-              state.doc.nodesBetween(from, to, (node, pos) => {
-                if (node.isInline) {
-                  return false
-                }
-                if (node.type.name !== 'paragraph') {
-                  if (pos + 1 <= from && pos + node.nodeSize - 1 >= to) {
-                  // skip nodes outside of the selected range
-                    return false
-                  } else {
-                  // cannot merge non-paragraph nodes inside selection
-                    hasParagraphsOnlySelected = false
-                    return false
-                  }
-                } else {
-                  const selectedText = (node.textContent ?? '').slice(
-                    pos + 1 > from ? 0 : from - pos - 1,
-                    pos + node.nodeSize - 1 < to ? node.nodeSize - 1 : to - pos - 1
-                  )
-                  textArr.push(selectedText ?? '')
-                }
-              })
-              if (hasParagraphsOnlySelected && textArr.length > 1) {
-                return chain()
-                  .command(({ state, tr }) => {
-                    tr.replaceRangeWith(from, to, this.type.create(attributes, state.schema.text(textArr.join('\n'))))
-                    return true
-                  })
-                  .setTextSelection({ from: from + 2, to: from + 2 })
-                  .run()
-              }
-            }
-            return commands.toggleNode(this.name, 'paragraph', attributes)
-          }
-    }
-  },
   addAttributes () {
     return {
       language: {
diff --git a/plugins/text-editor-resources/src/components/extension/codeblock.ts b/plugins/text-editor-resources/src/components/extension/codeblock.ts
index 95375706c5..40c2c4ebad 100644
--- a/plugins/text-editor-resources/src/components/extension/codeblock.ts
+++ b/plugins/text-editor-resources/src/components/extension/codeblock.ts
@@ -13,8 +13,9 @@
 // limitations under the License.
 //
 
-import { codeBlockOptions } from '@hcengineering/text'
+import { backtickInputRegex, codeBlockOptions, tildeInputRegex } from '@hcengineering/text'
 import { DropdownLabelsPopup, getEventPositionElement, showPopup } from '@hcengineering/ui'
+import { isActive, textblockTypeInputRule } from '@tiptap/core'
 import { type CodeBlockLowlightOptions, CodeBlockLowlight } from '@tiptap/extension-code-block-lowlight'
 import { type Node as ProseMirrorNode } from '@tiptap/pm/model'
 import { Plugin, PluginKey } from '@tiptap/pm/state'
@@ -33,6 +34,71 @@ export const codeBlockHighlightOptions: CodeBlockLowlightOptions = {
 }
 
 export const CodeBlockHighlighExtension = CodeBlockLowlight.extend<CodeBlockLowlightOptions>({
+  addCommands () {
+    return {
+      setCodeBlock:
+        (attributes) =>
+          ({ commands }) => {
+            return commands.setNode(this.name, attributes)
+          },
+      toggleCodeBlock:
+        (attributes) =>
+          ({ chain, commands, state }) => {
+            const { from, to } = state.selection
+
+            // merge multiple paragraphs into codeblock
+            if (!isActive(state, this.name) && !state.selection.empty) {
+              let hasParagraphsOnlySelected = true
+              const textArr: string[] = []
+              state.doc.nodesBetween(from, to, (node, pos) => {
+                if (node.isInline) {
+                  return false
+                }
+                if (node.type.name !== 'paragraph') {
+                  if (pos + 1 <= from && pos + node.nodeSize - 1 >= to) {
+                  // skip nodes outside of the selected range
+                    return false
+                  } else {
+                  // cannot merge non-paragraph nodes inside selection
+                    hasParagraphsOnlySelected = false
+                    return false
+                  }
+                } else {
+                  const selectedText = (node.textContent ?? '').slice(
+                    pos + 1 > from ? 0 : from - pos - 1,
+                    pos + node.nodeSize - 1 < to ? node.nodeSize - 1 : to - pos - 1
+                  )
+                  textArr.push(selectedText ?? '')
+                }
+              })
+              if (hasParagraphsOnlySelected && textArr.length > 1) {
+                return chain()
+                  .command(({ state, tr }) => {
+                    tr.replaceRangeWith(from, to, this.type.create(attributes, state.schema.text(textArr.join('\n'))))
+                    return true
+                  })
+                  .setTextSelection({ from: from + 2, to: from + 2 })
+                  .run()
+              }
+            }
+            return commands.toggleNode(this.name, 'paragraph', attributes)
+          }
+    }
+  },
+
+  addInputRules () {
+    return [
+      textblockTypeInputRule({
+        find: backtickInputRegex,
+        type: this.type
+      }),
+      textblockTypeInputRule({
+        find: tildeInputRegex,
+        type: this.type
+      })
+    ]
+  },
+
   addProseMirrorPlugins () {
     return [...(this.parent?.() ?? []), LanguageSelector(this.options)]
   }