diff --git a/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw b/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
index 61e7906d3d5..c54f9910a39 100644
--- a/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
+++ b/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
@@ -334,7 +334,7 @@
     <value>File name is too long</value>
   </data>
   <data name="ErrorMessage_InvalidChar" xml:space="preserve">
-    <value>File name contains invalid character(s): &gt;, &lt;, |, ", :, ?, *, \ or /</value>
+    <value>File name contains invalid character(s):&#xD;&#xA; &gt; &lt; | " : ? * \ /</value>
   </data>
 
 
diff --git a/src/modules/powerrename/lib/PowerRenameManager.cpp b/src/modules/powerrename/lib/PowerRenameManager.cpp
index 1e3639d5e66..d25a5895ac1 100644
--- a/src/modules/powerrename/lib/PowerRenameManager.cpp
+++ b/src/modules/powerrename/lib/PowerRenameManager.cpp
@@ -1123,7 +1123,7 @@ DWORD WINAPI CPowerRenameManager::s_regexWorkerThread(_In_ void* pv)
                         spItem->GetPath(&path);
 
                         // Following characters cannot be used for file names.
-                        // Ref https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions
+                        // Ref https://docs.microsoft.com/windows/win32/fileio/naming-a-file#naming-conventions
                         if (newNameToUseWstr.contains('<') ||
                             newNameToUseWstr.contains('>') ||
                             newNameToUseWstr.contains(':') ||
@@ -1136,8 +1136,8 @@ DWORD WINAPI CPowerRenameManager::s_regexWorkerThread(_In_ void* pv)
                         {
                             spItem->PutStatus(PowerRenameItemRenameStatus::ItemNameInvalidChar);
                         }
-                        // Max file path is 260.
-                        // Ref https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
+                        // Max file path is 260 and max folder path is 247.
+                        // Ref https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
                         else if ((isFolder && lstrlen(path) + (lstrlen(newNameToUse) - lstrlen(originalName)) > 247) ||
                             lstrlen(path) + (lstrlen(newNameToUse) - lstrlen(originalName)) > 260)
                         {