diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index e559212f..5b20796b 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -83,7 +83,7 @@ var MarkdownHighlightRules = function() {
         next  : "githubblock"
     }, { // block quote
         token : "string.blockquote",
-        regex : "^\\s*>[ ]",
+        regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
         next  : "blockquote"
     }, { // HR * - _
         token : "constant",
@@ -172,6 +172,10 @@ var MarkdownHighlightRules = function() {
             token : "empty_line",
             regex : "^\\s*$",
             next  : "start"
+        }, { // block quote
+            token : "string.blockquote",
+            regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+            next  : "blockquote"
         }, {
             include : "basic", noEscape: true
         }, {