diff --git a/CHANGELOG.md b/CHANGELOG.md
index e88d6f137..57933e404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 1. [](#improved)
     * Added method argument `Data::filter($missingValuesAsNull)`, defaulting to `false`
     * Improved `Grav\Common\User` class; added `$user->update()` method
+    * Added trim support for text input fields `validate: trim: true`
 1. [](#bugfix)
     * Fixed environment getting port added [#2284](https://github.com/getgrav/grav/issues/2284)
     * Fixed `FlexForm::updateObject()` to update array values when they are empty in the form
diff --git a/system/src/Grav/Common/Data/Validation.php b/system/src/Grav/Common/Data/Validation.php
index b3ab6a8bd..53f7b6c3f 100644
--- a/system/src/Grav/Common/Data/Validation.php
+++ b/system/src/Grav/Common/Data/Validation.php
@@ -133,6 +133,10 @@ class Validation
 
         $value = (string)$value;
 
+        if (!empty($params['trim'])) {
+            $value = trim($value);
+        }
+
         if (isset($params['min']) && \strlen($value) < $params['min']) {
             return false;
         }
@@ -155,6 +159,10 @@ class Validation
 
     protected static function filterText($value, array $params, array $field)
     {
+        if (!empty($params['trim'])) {
+            $value = trim($value);
+        }
+
         return (string) $value;
     }