diff --git a/test/javascripts/lib/markdown_test.js b/test/javascripts/lib/markdown_test.js
index b40e2a779..8e895208b 100644
--- a/test/javascripts/lib/markdown_test.js
+++ b/test/javascripts/lib/markdown_test.js
@@ -161,6 +161,12 @@ test("simple quotes", function() {
   cooked("- hello\n\n  > world\n  > eviltrout",
          "<ul><li>hello</li></ul>\n\n<blockquote><p>world<br/>eviltrout</p></blockquote>",
          "it allows quotes within a list.");
+
+  cooked("- <p>eviltrout</p>",
+         "<ul><li><p>eviltrout</p></li></ul>",
+         "it allows paragraphs within a list.");
+
+
   cooked("  > indent 1\n  > indent 2", "<blockquote><p>indent 1<br/>indent 2</p></blockquote>", "allow multiple spaces to indent");
 
 });
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index 2ec9e282f..47e9369e9 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -1012,7 +1012,8 @@
                   firstBlock = contents[0];
 
               if (firstBlock) {
-                firstBlock.shift();
+
+                if (isArray(firstBlock)) { firstBlock.shift(); }
                 contents.splice.apply(contents, [0, 1].concat(firstBlock));
                 add( last_li, loose, contents, nl );