diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index b5eb13a99..f83d9f76e 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -8,6 +8,7 @@
 #= require datepicker
 #= require spell_check
 #= require popover
+#= require text_field_trimmer
 #= require shared/general
 #= require registrar/autocomplete
 #= require registrar/application
diff --git a/app/assets/javascripts/text_field_trimmer.js b/app/assets/javascripts/text_field_trimmer.js
new file mode 100644
index 000000000..71cbc5295
--- /dev/null
+++ b/app/assets/javascripts/text_field_trimmer.js
@@ -0,0 +1,15 @@
+(function () {
+    function trimTextFields() {
+        let selector = 'input[type=text], input[type=search], input[type=email], textarea';
+        let textFields = document.querySelectorAll(selector);
+        let listener = function () {
+            this.value = this.value.trim();
+        };
+
+        for (let field of textFields) {
+            field.addEventListener('change', listener);
+        }
+    }
+
+    trimTextFields();
+})();