             textFlow.flowComposer = flowComposer;
             
             // Give it an EditManager to make it editable.
-            var editManager:TextViewEditManager = new TextViewEditManager();
+            
+            var editManager:TextViewEditManager = 
+                new TextViewEditManager(mx_internal::undoManager);
+            
             // TODO! Temporary workaround because selectionColor
             // isn't getting set for FxApplications.
             var selectionColor:* = getStyle("selectionColor");

     *  @private
     */
    mx_internal var passwordChar:String = "*";

    //--------------------------------------------------------------------------
    //

////////////////////////////////////////////////////////////////////////////////

import flashx.textLayout.edit.EditManager;
import flashx.textLayout.edit.IUndoManager;
import flashx.textLayout.operations.FlowOperation;

class TextViewEditManager extends EditManager
{
    public function TextViewEditManager(undoManager:IUndoManager = null)
    {
        super(undoManager);
    }

    public function execute(flowOperation:FlowOperation):void
