diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92f79a1ff1b4..d1a1a8c167a3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -941,6 +941,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
             m_aStates.top().nDestinationState = DESTINATION_SHAPETEXT;
             OSL_ENSURE(!m_aShapetextBuffer.size(), "shapetext buffer is not empty");
             m_pCurrentBuffer = &m_aShapetextBuffer;
+            m_bNeedPap = true;
             break;
         case RTF_LISTTEXT:
             // Should be ignored by any reader that understands Word 97 through Word 2007 numbering.
@@ -2517,7 +2518,12 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
                 m_aStates.top().aShape.nBottom - m_aStates.top().aShape.nTop));
 
     Mapper().startShape(xShape);
+    Mapper().startParagraphGroup();
     replayBuffer(m_aShapetextBuffer);
+    Mapper().startCharacterGroup();
+    lcl_Break(Mapper());
+    Mapper().endCharacterGroup();
+    Mapper().endParagraphGroup();
     Mapper().endShape();
 }