diff --git a/src/main/kotlin/com/templ/templ/TemplCommenter.kt b/src/main/kotlin/com/templ/templ/TemplCommenter.kt
new file mode 100644
index 0000000..f91b0ca
--- /dev/null
+++ b/src/main/kotlin/com/templ/templ/TemplCommenter.kt
@@ -0,0 +1,30 @@
+package com.templ.templ
+
+import com.intellij.lang.Commenter
+import org.jetbrains.annotations.Nullable
+
+
+internal class TemplCommenter : Commenter {
+    override fun getLineCommentPrefix(): String {
+        return "//"
+    }
+
+    override fun getBlockCommentPrefix(): String {
+        return "/*"
+    }
+
+    @Nullable
+    override fun getBlockCommentSuffix(): String {
+        return "*/"
+    }
+
+    @Nullable
+    override fun getCommentedBlockCommentPrefix(): String? {
+        return null
+    }
+
+    @Nullable
+    override fun getCommentedBlockCommentSuffix(): String? {
+        return null
+    }
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f5fa199..4a2be04 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -21,6 +21,9 @@
         <lang.parserDefinition
                 language="templ"
                 implementationClass="com.templ.templ.parsing.TemplParserDefinition"/>
+        <lang.commenter
+                language="templ"
+                implementationClass="com.templ.templ.TemplCommenter"/>
         <lang.fileViewProviderFactory language="templ" implementationClass="com.templ.templ.file.TemplFileViewProviderFactory"/>
         <editorHighlighterProvider filetype="templ" implementationClass="com.templ.templ.highlighting.TemplEditorHighlighterProvider"/>
         <projectService serviceImplementation="com.templ.templ.TemplSettings"/>