diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold
--- a/autotests/folding/highlight.sh.fold
+++ b/autotests/folding/highlight.sh.fold
@@ -23,7 +23,10 @@
 #this too
 echo this is#nt a comment
 dcop kate EditInterface#1 #this is
-
+grep -e "^default/linux/amd64/" |\ #this is a comment
+mkdir this\ isnt\ #a\ comment
+mkdir this\ isnt\\\;#a\ comment
+mkdir this\\ #is a comment
 
 # brace expansion
 mv my_file.{JPG,jpg}
diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html
--- a/autotests/html/highlight.sh.html
+++ b/autotests/html/highlight.sh.html
@@ -29,7 +29,10 @@
 <span style="color:#898887;">#this too</span>
 <span style="color:#644a9b;font-weight:bold;">echo</span> this is#nt a comment
 <span style="color:#644a9b;">dcop</span> kate EditInterface#1 <span style="color:#898887;">#this is</span>
-
+<span style="color:#644a9b;">grep</span> -e <span style="color:#bf0303;">&quot;^default/linux/amd64/&quot;</span> <span style="font-weight:bold;">|</span><span style="color:#0095ff;font-weight:bold;">\ </span><span style="color:#898887;">#this is a comment</span>
+<span style="color:#644a9b;">mkdir</span> this<span style="color:#0057ae;">\ </span>isnt<span style="color:#0057ae;">\ </span>#a<span style="color:#0057ae;">\ </span>comment
+<span style="color:#644a9b;">mkdir</span> this<span style="color:#0057ae;">\ </span>isnt<span style="color:#0057ae;">\\\;</span>#a<span style="color:#0057ae;">\ </span>comment
+<span style="color:#644a9b;">mkdir</span> this<span style="color:#0057ae;">\\</span> <span style="color:#898887;">#is a comment</span>
 
 <span style="color:#898887;"># brace expansion</span>
 <span style="color:#644a9b;">mv</span> my_file.<span style="color:#0057ae;">{JPG,jpg}</span>
diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh
--- a/autotests/input/highlight.sh
+++ b/autotests/input/highlight.sh
@@ -23,7 +23,10 @@
 #this too
 echo this is#nt a comment
 dcop kate EditInterface#1 #this is
-
+grep -e "^default/linux/amd64/" |\ #this is a comment
+mkdir this\ isnt\ #a\ comment
+mkdir this\ isnt\\\;#a\ comment
+mkdir this\\ #is a comment
 
 # brace expansion
 mv my_file.{JPG,jpg}
@@ -204,4 +207,4 @@
 1) echo yyy;
 esac
 
-ls #should be outside of case 1 folding block
\ No newline at end of file
+ls #should be outside of case 1 folding block
diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref
--- a/autotests/reference/highlight.sh.ref
+++ b/autotests/reference/highlight.sh.ref
@@ -23,7 +23,10 @@
 <Comment>#this too</Comment><br/>
 <Builtin>echo</Builtin><Normal Text> this is#nt a comment</Normal Text><br/>
 <Command>dcop</Command><Normal Text> kate EditInterface#1 </Normal Text><Comment>#this is</Comment><br/>
-<Normal Text></Normal Text><br/>
+<Command>grep</Command><Normal Text> </Normal Text><Option>-e</Option><Normal Text> </Normal Text><String DoubleQ>"^default/linux/amd64/"</String DoubleQ><Normal Text> </Normal Text><Control>|</Control><OtherCommand>\ </OtherCommand><Comment>#this is a comment</Comment><br/>
+<Command>mkdir</Command><Normal Text> this</Normal Text><Escape>\ </Escape><Normal Text>isnt</Normal Text><Escape>\ </Escape><Normal Text>#a</Normal Text><Escape>\ </Escape><Normal Text>comment</Normal Text><br/>
+<Command>mkdir</Command><Normal Text> this</Normal Text><Escape>\ </Escape><Normal Text>isnt</Normal Text><Escape>\\\;</Escape><Normal Text>#a</Normal Text><Escape>\ </Escape><Normal Text>comment</Normal Text><br/>
+<Command>mkdir</Command><Normal Text> this</Normal Text><Escape>\\</Escape><Normal Text> </Normal Text><Comment>#is a comment</Comment><br/>
 <Normal Text></Normal Text><br/>
 <Comment># brace expansion</Comment><br/>
 <Command>mv</Command><Normal Text> my_file.</Normal Text><Escape>{JPG,jpg}</Escape><br/>
diff --git a/autotests/reference/test.bb.ref b/autotests/reference/test.bb.ref
--- a/autotests/reference/test.bb.ref
+++ b/autotests/reference/test.bb.ref
@@ -30,7 +30,7 @@
 <String>"</String><br/>
 <Normal Text></Normal Text><br/>
 <OEFunction>do_install_append</OEFunction><Normal Text>() {</Normal Text><br/>
-<Normal Text>   </Normal Text><Normal Text> </Normal Text><Comment># multiline string ok here</Comment><br/>
+<Normal Text>    </Normal Text><Comment># multiline string ok here</Comment><br/>
 <Normal Text>    </Normal Text><Variable>AVAR=</Variable><String DoubleQ>"this is</String DoubleQ><br/>
 <String DoubleQ>right"</String DoubleQ><br/>
 <Keyword>}</Keyword><br/>
diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
--- a/data/syntax/bash.xml
+++ b/data/syntax/bash.xml
@@ -7,8 +7,9 @@
         <!ENTITY eos      "(?=($|\s))">                 <!-- eol or space following -->
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+        <!ENTITY charbeforecomment "[\s;]">             <!-- character before a comment # -->
 ]>
-<language name="Bash" version="9" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="10" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -473,6 +474,9 @@
       <!-- FindMost tries to interpret anything except commands -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindMost">
         <IncludeRules context="FindComments" />
+        <IncludeRules context="FindMostWithoutComments" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindMostWithoutComments">
         <IncludeRules context="FindStrings" />
         <IncludeRules context="FindSubstitutions" />
         <IncludeRules context="FindOthers" />
@@ -482,7 +486,13 @@
       <!-- FindComments consumes shell comments till EOL -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindComments">
         <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="Comment" String="[\s;](?=#)" />
+        <RegExpr attribute="Comment" context="Comment" String="(?&lt;=&charbeforecomment;)#" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsInCommand">
+        <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
+        <!-- NOTE: If a rule already matches a character of &charbeforecomment;
+             (for example, in an escaped character), the comment will not be highlighted. -->
+        <RegExpr attribute="Normal Text" context="Comment" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
         <IncludeRules context="##Alerts" />
@@ -492,7 +502,7 @@
       <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
         <DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
+        <RegExpr attribute="Normal Text" context="CommentParen" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="CommentParen">
         <RegExpr attribute="Comment" context="#pop" String="[^)](?=\))" />
@@ -502,7 +512,7 @@
       <!-- FindCommentsBackq consumes shell comments till EOL or a backquote -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsBackq">
         <DetectChar attribute="Comment" context="CommentBackq" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="CommentBackq" String="[\s;](?=#)" />
+        <RegExpr attribute="Normal Text" context="CommentBackq" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="CommentBackq">
         <RegExpr attribute="Comment" context="#pop" String="[^`](?=`)" />
@@ -567,13 +577,27 @@
         <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
         <RegExpr attribute="OtherCommand" context="CommandArgs" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
         <!-- This list is not complete. ie, ":" is missing but as it is in bash completition. -->
-        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />
+        <RegExpr attribute="OtherCommand" context="CommandArgsNormal" String="&pathpart;*" />
       </context>
 
       <!-- CommandArgs matches the items after a command -->
       <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">
-        <LineContinue />
+        <!-- In command arguments, do not allow comments after escaped characters.
+             This avoids highlighting comments within paths or other text. Ex: pathtext\ #no\ comment -->
+        <!-- FindComments -->
+        <RegExpr attribute="Control" context="#pop!Comment" String=";;?(?=#)" />
+        <IncludeRules context="FindCommentsInCommand" />
+        <IncludeRules context="FindMostWithoutComments" />
+        <IncludeRules context="DefaultCommandArgs" />
+      </context>
+      <!-- CommandArgs but with normal comments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsNormal">
         <IncludeRules context="FindMost" />
+        <IncludeRules context="DefaultCommandArgs" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="DefaultCommandArgs">
+        <LineContinue />
         <RegExpr attribute="Keyword" context="#stay" String="\\$" />
         <!-- handle keywords -->
         <RegExpr attribute="Option" context="#stay" String="\.(?=\s)" />
@@ -585,7 +609,7 @@
         <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
         <!-- handle redirection -->
         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
-        <!-- handle &, &&, | and || -->
+        <!-- handle &, &&, |, ||, ; and ;; -->
         <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />
         <RegExpr attribute="Normal Text" context="#stay" String="[a-zA-Z_]+-[A-Za-z0-9_-]*" />
         <RegExpr attribute="Option" context="#stay" String="-?-[a-zA-Z_][A-Za-z0-9_-]*" />