diff --git a/tools/Custom/PSCmdletExtensions.cs b/tools/Custom/PSCmdletExtensions.cs
index 7b5c42c27a..f3b147082f 100644
--- a/tools/Custom/PSCmdletExtensions.cs
+++ b/tools/Custom/PSCmdletExtensions.cs
@@ -29,7 +29,7 @@ internal static string UnescapeString(this PSCmdlet cmdlet, string value)
             try
             {
                 var unescapedString = Uri.UnescapeDataString(value);
-                return value.EndsWith("'") ? unescapedString: unescapedString.Replace('+', ' ');
+                return (value.EndsWith("'") || value.EndsWith("')")) ? unescapedString: unescapedString.Replace('+', ' ');
             }
             catch (UriFormatException ex)
             {