             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");

import flash.display.BlendMode;
import flash.display.Graphics;
import flash.events.Event;
import flash.geom.Rectangle;
import flash.text.engine.ElementFormat;
import flash.text.engine.FontDescription;


    //--------------------------------------------------------------------------
    //
    //  Overridden event handlers: UIComponent
    //
    //--------------------------------------------------------------------------

    /**
     *  @private
     */
    override protected function focusOutHandler(event:FocusEvent):void
    {
        // By default, we clear the undo history when a TextView loses focus.
        if (mx_internal::clearUndoOnFocusOut)
            mx_internal::undoManager.clear();
    }

    //--------------------------------------------------------------------------
    //
    //  Event handlers
    //
    //--------------------------------------------------------------------------
