diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 11ce9187..e9761674 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -181,7 +181,19 @@ map -docstring "goto next buffer" global normal <c-i> ": bn<ret>"
 map global normal <tab> _
 
 # comments
-map -docstring "comment line" global normal "#" ": comment-line<ret>"
+define-command comment-line-as-block %{
+    execute-keys -draft 'xs[^\n]<ret><a-_>: comment-block<ret>'
+}
+define-command smart-comment %{
+    evaluate-commands %sh{
+        if [ -z "${kak_opt_comment_line}" ]; then
+            echo "comment-line-as-block"
+        else
+            echo "comment-line"
+        fi
+    }
+}
+map -docstring "smart comment" global normal "#" ": smart-comment<ret>"
 map -docstring "comment block" global normal "<a-#>" ": comment-block<ret>"
 
 # formatting