diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js
index 5d22b45bcc5..5d000e8b5fa 100644
--- a/test/javascripts/components/markdown_test.js
+++ b/test/javascripts/components/markdown_test.js
@@ -210,6 +210,13 @@ test("Mentions", function() {
 
 });
 
+
+test("Heading", function() {
+    cooked("**Bold**\n----------",
+           "<h2><strong>Bold</strong></h2>",
+           "It will bold the heading");
+});
+
 test("Oneboxing", function() {
 
   var matches = function(input, regexp) {
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index c73224f0306..d626ae994c2 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -372,7 +372,7 @@ Markdown.dialects.Gruber = {
       if ( !m ) return undefined;
 
       var level = ( m[ 2 ] === "=" ) ? 1 : 2;
-      var header = [ "header", { level : level }, m[ 1 ] ];
+      var header = [ "header", { level : level } ].concat( this.processInline(m[ 1 ]) );
 
       if ( m[0].length < block.length )
         next.unshift( mk_block( block.substr( m[0].length ), block.trailing, block.lineNumber + 2 ) );