diff --git a/lib/ace/mode/sh_highlight_rules.js b/lib/ace/mode/sh_highlight_rules.js
index af20852f..a73efb5e 100644
--- a/lib/ace/mode/sh_highlight_rules.js
+++ b/lib/ace/mode/sh_highlight_rules.js
@@ -78,8 +78,8 @@ var ShHighlightRules = function() {
 
     this.$rules = {
         "start" : [ {
-            token : ["comment"],
-            regex : /(?:^|\s)(#.*$)/
+            token : ["text", "comment"],
+            regex : /(^|\s)(#.*)$/
         }, {
             token : "string",           // " string
             regex : '"(?:[^\\\\]|\\\\.)*?"'
@@ -116,9 +116,6 @@ var ShHighlightRules = function() {
         }, {
             token : "paren.rparen",
             regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
         } ]
     };
 };