diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle
index 66cd22622146..7a9d367b73df 100644
--- a/WordPressEditor/build.gradle
+++ b/WordPressEditor/build.gradle
@@ -22,8 +22,8 @@ android {
     buildToolsVersion "23.0.3"
 
     defaultConfig {
-        versionCode 11
-        versionName "1.1"
+        versionCode 12
+        versionName "1.2"
         minSdkVersion 16
         targetSdkVersion 23
     }
diff --git a/libs/editor-common/assets/editor-utils-formatter.js b/libs/editor-common/assets/editor-utils-formatter.js
index dc4f67764c57..d235aec985d0 100644
--- a/libs/editor-common/assets/editor-utils-formatter.js
+++ b/libs/editor-common/assets/editor-utils-formatter.js
@@ -22,6 +22,10 @@ Formatter.convertPToDiv = function(html) {
     mutatedHTML = mutatedHTML.replace(/(<img [^<>]*>|<\/a>|<\/video>|<\/span>)<br \/>/igm,
             function replaceBrWithDivs(match) { return match.substr(0, match.length - 6) + '</div><div>'; });
 
+    // Append paragraph-wrapped break tag under media at the end of a post
+    mutatedHTML = mutatedHTML.replace(/(<img [^<>]*>|<\/a>|<\/video>|<\/span>)[^<>]*<\/div>\s$/igm,
+            function replaceBrWithDivs(match) { return match + '<div><br></div>'; });
+
     return mutatedHTML;
 }
 
diff --git a/libs/editor-common/assets/test/test-formatter.js b/libs/editor-common/assets/test/test-formatter.js
index 3bdc8a35f5f9..a59e61ec0f4d 100644
--- a/libs/editor-common/assets/test/test-formatter.js
+++ b/libs/editor-common/assets/test/test-formatter.js
@@ -56,7 +56,7 @@ function testMediaParagraphWrapping(mediaType, htmlModeMediaHtml, visualModeMedi
       assert.equal('<p>' + visualModeMediaHtml + '</p>\n', visualFormattingApplied);
 
       var convertedToDivs = formatter.convertPToDiv(visualFormattingApplied).replace(/\n/g, '');
-      assert.equal('<div>' + visualModeMediaHtml + '</div>', convertedToDivs);
+      assert.equal('<div>' + visualModeMediaHtml + '</div><div><br></div>', convertedToDivs);
     });
 
     it('with paragraphs above and below', function () {
@@ -106,7 +106,7 @@ function testMediaParagraphWrapping(mediaType, htmlModeMediaHtml, visualModeMedi
       assert.equal('<p>Line 1</p>\n<p>' + visualModeMediaHtml + '</p>\n', visualFormattingApplied);
 
       var convertedToDivs = formatter.convertPToDiv(visualFormattingApplied).replace(/\n/g, '');
-      assert.equal('<div>Line 1</div><div>' + visualModeMediaHtml + '</div>', convertedToDivs);
+      assert.equal('<div>Line 1</div><div>' + visualModeMediaHtml + '</div><div><br></div>', convertedToDivs);
     });
 
     it('end of post, with line break above', function () {
@@ -116,7 +116,7 @@ function testMediaParagraphWrapping(mediaType, htmlModeMediaHtml, visualModeMedi
       assert.equal('<p>Line 1<br \/>\n' + visualModeMediaHtml + '</p>\n', visualFormattingApplied);
 
       var convertedToDivs = formatter.convertPToDiv(visualFormattingApplied).replace(/\n/g, '');
-      assert.equal('<div>Line 1</div><div>' + visualModeMediaHtml + '</div>', convertedToDivs);
+      assert.equal('<div>Line 1</div><div>' + visualModeMediaHtml + '</div><div><br></div>', convertedToDivs);
     });
   });
 }