diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index 5f7cade..cbe698c 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -149,7 +149,7 @@
     /* followed by one or more whitespace characters */
     "[[:space:]]+"
     /* followed by a chunk of nonwhitespace for text field */
-    "([^[:space:]]+)"
+    "([[:print:]]*[^[:space:]])"
     /* followed by optional whitespace */
     "[[:space:]]*$";