diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 398e14d3a25b..efa2e0770d8b 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1055,9 +1055,6 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
                 DBG_UNHANDLED_EXCEPTION();
             }
         }
-
-        if ( xPSI.is() && xPSI->hasPropertyByName( FM_PROP_WRITING_MODE ) )
-            _rxModel->setPropertyValue( FM_PROP_WRITING_MODE, makeAny( WritingMode2::CONTEXT ) );
     }
 
     m_xLastCreatedControlModel.clear();
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index eea338c58c38..2d66b2b556d0 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -590,6 +590,9 @@ namespace svxform
             {
                 _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT, makeAny( sal_Bool( sal_True ) ) );
             }
+
+            if ( xPSI->hasPropertyByName( FM_PROP_WRITING_MODE ) )
+                _rxModel->setPropertyValue( FM_PROP_WRITING_MODE, makeAny( WritingMode2::CONTEXT ) );
         }
         catch( const Exception& )
         {