diff --git a/lib/ace/mode/markdown.js b/lib/ace/mode/markdown.js
index 7b74fbcb..918fd528 100644
--- a/lib/ace/mode/markdown.js
+++ b/lib/ace/mode/markdown.js
@@ -55,12 +55,13 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.getNextLineIndent = function(state, line, tab) {
         if (state == "listblock") {
-            var match = /^((?:.+)?)(([-+*]|\d+\.)\s+)/.exec(line);
-            if (match) {
-                return new Array(match[1].length + 1).join(" ") + match[2];
-            } else {
+            var match = /^(\s*)(?:([-+*])|(\d+)\.)(\s+)/.exec(line);
+            if (!match)
                 return "";
-            }
+            var marker = match[2];
+            if (!marker)
+                marker = parseInt(match[3], 10) + 1 + ".";
+            return match[1] + marker + match[4];
         } else {
             return this.$getIndent(line);
         }