Shortcut / Menu swapping bug - sometimes occurs in menus

Win2K Pro SP3
TLB 1.2.7 RC3

When I have a shortcut and folder in the same menu, they will occasionally swap positions. This is most noticeable in my games menu, where I have a shortcuts to all my games and, hidden by an expand/collapse seperator, I also have the folders for those game files. If the folder and shortcut have exactly the same name, they will switch places; the folder will be shown and the shortcut hidden. I've been able to get around this by renaming the shortcut.

Incidentally: I think it would be a good idea to not include the .lnk extension in the dialog box to rename shortcuts. If the user were to accidentally overwrite the extension (easy to do since the whole filename, extension and all, is by default highlighted), the system would no longer know what to do with the file. I'd recommend just passing the filename without the extension to the dialog, and adding the .lnk to the end when it returns.