diff --git a/src/strings/strings.go b/src/strings/strings.go
index a563f37cf59c1..1dc4238522ad9 100644
--- a/src/strings/strings.go
+++ b/src/strings/strings.go
@@ -962,7 +962,8 @@ func TrimSpace(s string) string {
 	for ; stop > start; stop-- {
 		c := s[stop-1]
 		if c >= utf8.RuneSelf {
-			return TrimFunc(s[start:stop], unicode.IsSpace)
+			// start has been already trimmed above, should trim end only
+			return TrimRightFunc(s[start:stop], unicode.IsSpace)
 		}
 		if asciiSpace[c] == 0 {
 			break