diff --git a/screen.go b/screen.go
index 8f75b22..4d3d2e5 100644
--- a/screen.go
+++ b/screen.go
@@ -121,12 +121,14 @@ func ShowScreen(screen Screen, values map[string]string, crow, ccol int,
 		return response, err
 	}
 
-	// Strip leading+trailing spaces from field values
+	// Strip trailing spaces from field values. Most applications will want to
+	// strip leading spaces, too, but it's possible they want them preserved,
+	// so we'll leave that to the caller.
 	for _, fld := range screen {
 		if !fld.KeepSpaces {
 			if _, ok := response.Values[fld.Name]; ok {
 				response.Values[fld.Name] =
-					strings.TrimSpace(response.Values[fld.Name])
+					strings.TrimRight(response.Values[fld.Name], " ")
 			}
 		}
 	}