             // The 229 keyCode is for IME compatability. When entering an IME expression,
             // the enter key is down, but the keyCode is 229 instead of the enter key code.
             // Thanks to Yukari for this little trick...
-            if (endEdit(ListEventReason.NEW_ROW))
-                if (!dontEdit)
-                    findNextEnterItemRenderer(event);
+            if (endEdit(ListEventReason.NEW_ROW) && !dontEdit)
+            {
+                findNextEnterItemRenderer(event);
+                    
+                if (focusManager)
+                    focusManager.defaultButtonEnabled = false;
+            }
         }
     }
 

        if (itemEditorInstance)
        {
            DisplayObject(itemEditorInstance).removeEventListener(KeyboardEvent.KEY_DOWN, editorKeyDownHandler);
            systemManager.getSandboxRoot().
                removeEventListener(MouseEvent.MOUSE_DOWN, editorMouseDownHandler, true);
            systemManager.getSandboxRoot().

            // trace("setting focus to item editor");
            if (itemEditorInstance is IFocusManagerComponent)
                fm.setFocus(IFocusManagerComponent(itemEditorInstance));
            
            var event:ListEvent =
                new ListEvent(ListEvent.ITEM_FOCUS_IN);
            event.rowIndex = _editedItemPosition.rowIndex;
