diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 15fbb5538958..38e79a6968fb 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -6,6 +6,7 @@
  * Block Editor: Fix issue when multiple media selection adds only one image or video block.
  * Block Editor: Add Link Target (Open in new tab) to Image Block.
  * Block Editor: New block "Media & Text".
+ * Block Editor: Fix issue where the block inserter layout wasn't correct after device rotation.
  
 13.4
 -----
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
index 80fa74116c24..cd3968719d82 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
@@ -54,8 +54,9 @@ public class PostUtils {
 
     private static final String GUTENBERG_BLOCK_START = "<!-- wp:";
     private static final int SRC_ATTRIBUTE_LENGTH_PLUS_ONE = 5;
-    private static final String GB_IMG_BLOCK_HEADER_PLACEHOLDER = "<!-- wp:image {\"id\":%s} -->";
+    private static final String GB_IMG_BLOCK_HEADER_PLACEHOLDER = "<!-- wp:image {\"id\":%s";
     private static final String GB_IMG_BLOCK_CLASS_PLACEHOLDER = "class=\"wp-image-%s\"";
+    private static final String GB_MEDIA_TEXT_BLOCK_HEADER_PLACEHOLDER = "<!-- wp:media-text {\"mediaId\":%s";
 
     public static Map<String, Object> addPostTypeToAnalyticsProperties(PostModel post, Map<String, Object> properties) {
         if (properties == null) {
@@ -416,6 +417,11 @@ public static String replaceMediaFileWithUrlInGutenbergPost(@NonNull String post
                 String newImgBlockHeader = String.format(GB_IMG_BLOCK_HEADER_PLACEHOLDER, mediaFile.getMediaId());
                 postContent = postContent.replace(oldImgBlockHeader, newImgBlockHeader);
 
+                String oldMediaTextBlockHeader = String.format(GB_MEDIA_TEXT_BLOCK_HEADER_PLACEHOLDER, localMediaId);
+                String newMediaTextBlockHeader = String.format(GB_MEDIA_TEXT_BLOCK_HEADER_PLACEHOLDER,
+                        mediaFile.getMediaId());
+                postContent = postContent.replace(oldMediaTextBlockHeader, newMediaTextBlockHeader);
+
                 // replace class wp-image-id with serverMediaId, and url_holder with remoteUrl
                 String oldImgClass = String.format(GB_IMG_BLOCK_CLASS_PLACEHOLDER, localMediaId);
                 String newImgClass = String.format(GB_IMG_BLOCK_CLASS_PLACEHOLDER, mediaFile.getMediaId());
diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index 80ffe3550c04..6865978e5871 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit 80ffe3550c0451ee106607a3d0fbadf1953f2f72
+Subproject commit 6865978e5871fedfa960df39f227f04bcaf8b123