                 fm.fauxFocus = null;
                 
                 if (found)
+                {
                     fm.setFocus(IFocusManagerComponent(o));
+                    
+                    // Since we may have gotton here with the F2 key show the focus
+                    // indicator to make it obvious which control has focus.
+                    fm.showFocus();
+                }
                 
-                editedItemRenderer.addEventListener(FocusEvent.FOCUS_OUT, itemEditorInstance_focusOutHandler);
+                editedItemRenderer.addEventListener(FocusEvent.FOCUS_OUT, editor_focusOutHandler);
                 
                 // listen for keyStrokes on the itemEditorInstance (which lets the grid supervise for ESC/ENTER)
-                editedItemRenderer.addEventListener(KeyboardEvent.KEY_DOWN, itemEditorInstance_keyDownHandler);
-                editedItemRenderer.addEventListener(FocusEvent.KEY_FOCUS_CHANGE, keyFocusChangeHandler, false, 1000);
-
+                editedItemRenderer.addEventListener(KeyboardEvent.KEY_DOWN, editor_keyDownHandler);
+                editedItemRenderer.addEventListener(FocusEvent.KEY_FOCUS_CHANGE, editor_keyFocusChangeHandler, false, 1000);
+                addRemoveFlexEventEnterListener(DisplayObject(editedItemRenderer), true);
+                
                 // It would be nice to hide the selection on the cell while it is
                 // being edited to provide better contrast for the focus rect 
                 // around the controls.

        else if (event.charCode == Keyboard.ENTER && event.keyCode != 229)
        {
            if (!_editedItemPosition)
                return;
            
            // multiline editors can take the enter key.
            if (itemEditorInstance && itemEditorInstance.editorUsesEnterKey)
                return;
            
            // Enter closes the editor.

        
        // Notify event that a new editor is starting.
        var dataGridEvent:GridItemEditorEvent =
            new GridItemEditorEvent(GridItemEditorEvent.GRID_ITEM_EDITOR_SESSION_START);
        
        dataGridEvent.columnIndex = editedItemPosition.columnIndex;
        dataGridEvent.column = column;
