diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp
index 2da6f45bb..8345ca007 100644
--- a/src/eepp/ui/uirichtext.cpp
+++ b/src/eepp/ui/uirichtext.cpp
@@ -1017,6 +1017,9 @@ void UIRichText::rebuildRichText( UILayout* container, RichText& richText, Intri
 				richText.addSpan( "", span->getFontStyleConfig(), rightOnly, padRightOnly );
 			}
 
+			if ( shouldCollapse && span->isInlineBlock() )
+				lastSpanEndsWithSpace = true;
+
 			handled = true;
 		}