Bug w/ in place editing for tree control

Hi Everyone,

I have dialog box which contains a tree control. In the tree control, I allow the user to edit (in place) the items in the tree. As soon as the user hits the Enter key to signify the end of editing, my CDialog::OnOK() gets called immediately (even before I get the notification message TVN_ENDLABELEDIT). Has anyone seen this? I don't get the same problem if the code is moved to a CFormView. Thanks in advance.

BTW, I don't get this problem if the user edits the tree items, and clicks on another item in the tree control (to signify the edit of an edit).