diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index ce6ad5900a1..493af4a2629 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -2238,6 +2238,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
                     PIDLIST_ABSOLUTE pidlFull = ILCombine(m_pidlParent, pidl);
                     SHGetPathFromIDListW(pidlFull, szFullPath);
 
+                    INT cchLimit = 0;
+                    _DoFolderViewCB(SFVM_GETNAMELENGTH, (WPARAM)pidlFull, (LPARAM)&cchLimit);
+                    if (cchLimit)
+                        ::SendMessageW(hEdit, EM_SETLIMITTEXT, cchLimit, 0);
+
                     if (!SHELL_FS_HideExtension(szFullPath))
                     {
                         LPWSTR pszText = lpdi->item.pszText;