diff --git a/runtime/pack/dist/opt/comment/autoload/comment.vim b/runtime/pack/dist/opt/comment/autoload/comment.vim
index c758a7d403..d78b69b2a3 100644
--- a/runtime/pack/dist/opt/comment/autoload/comment.vim
+++ b/runtime/pack/dist/opt/comment/autoload/comment.vim
@@ -1,7 +1,7 @@
 vim9script
 
 # Maintainer: Maxim Kim <habamax@gmail.com>
-# Last Update: 2024-09-30
+# Last Update: 2024 Oct 05
 #
 # Toggle comments
 # Usage:
@@ -58,9 +58,13 @@ export def Toggle(...args: list<string>): string
                 # handle % with substitute
                 line = printf(substitute(cms, '%s\@!', '%%', 'g'), getline(lnum))
             else
-                # handle % with substitute
+                line = getline(lnum)
+                var indent_start_len = strlen(indent_start)
+                # handle % with substitute,
+                # consider different whitespace indenting
                 line = printf(indent_start .. substitute(cms, '%s\@!', '%%', 'g'),
-                        strpart(getline(lnum), strlen(indent_start)))
+                    strpart(line, (line[0 : strlen(indent_start_len) - 1] =~ '\t' ?
+                    indent_start_len / &tabstop : indent_start_len)))
             endif
         else
             line = substitute(getline(lnum), $'^\s*\zs{cms_l[0]} \?\| \?{cms_l[1]}$', '', 'g')