diff --git a/CHANGELOG.md b/CHANGELOG.md
index f37c1d52c5..aa66efa5a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,12 +69,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [\#1547](https://github.com/cosmos/voyager/issues/1547) deleted archive directory of old components @jbibla
 - removed unit tests from prepush hook @faboweb
 - [\#1566](https://github.com/cosmos/voyager/issues/1566) putting querying errors in the store instead of showing notifications @faboweb
-- [\1612](https://github.com/cosmos/voyager/issues/1612) defined props types on components
+- [\#1612](https://github.com/cosmos/voyager/issues/1612) defined props types on components
 - changed `err` to `error` because abbreviations are bad @faboweb
-- [\1609](https://github.com/cosmos/voyager/issues/1609) switched to css and html to onboard developers faster @faboweb
-- [\1594](https://github.com/cosmos/voyager/issues/1594) disable decimal amount transfers @fedekunze
-- [\1680](https://github.com/cosmos/voyager/issues/1680) updated `TmBalance` to receive tabs an array of objects to avoid conflicting routes @fedekunze
-- [\1638](https://github.com/cosmos/voyager/issues/1638) removed account password from the state and now user has to input it on every transaction @fedekunze
+- [\#1609](https://github.com/cosmos/voyager/issues/1609) switched to css and html to onboard developers faster @faboweb
+- [\#1594](https://github.com/cosmos/voyager/issues/1594) disable decimal amount transfers @fedekunze
+- [\#1680](https://github.com/cosmos/voyager/issues/1680) updated `TmBalance` to receive tabs an array of objects to avoid conflicting routes @fedekunze
+- [\#1638](https://github.com/cosmos/voyager/issues/1638) removed account password from the state and now user has to input it on every transaction @fedekunze
+- [\#1655](https://github.com/cosmos/voyager/issues/1655) Text and Textarea fields trimmed @sabau
 
 ### Fixed
 
diff --git a/app/src/renderer/components/common/TmModalSearch.vue b/app/src/renderer/components/common/TmModalSearch.vue
index 0cd2d0e950..5bb4330f6d 100644
--- a/app/src/renderer/components/common/TmModalSearch.vue
+++ b/app/src/renderer/components/common/TmModalSearch.vue
@@ -41,7 +41,7 @@
         <div class="tm-modal-search-field">
           <tm-field
             id="search-input"
-            v-model="query"
+            v-model.trim="query"
             class="mousetrap"
             type="text"
             placeholder="Search..."
diff --git a/app/src/renderer/components/common/TmSessionImport.vue b/app/src/renderer/components/common/TmSessionImport.vue
index 33e0ed76cb..6d45a63c04 100644
--- a/app/src/renderer/components/common/TmSessionImport.vue
+++ b/app/src/renderer/components/common/TmSessionImport.vue
@@ -16,7 +16,7 @@
         >
           <tm-field
             id="import-name"
-            v-model="fields.importName"
+            v-model.trim="fields.importName"
             type="text"
             placeholder="Must have at least 5 characters"
           />
diff --git a/app/src/renderer/components/common/TmSessionSignUp.vue b/app/src/renderer/components/common/TmSessionSignUp.vue
index 9c2db93357..0539f29dd0 100644
--- a/app/src/renderer/components/common/TmSessionSignUp.vue
+++ b/app/src/renderer/components/common/TmSessionSignUp.vue
@@ -16,7 +16,7 @@
         >
           <tm-field
             id="sign-up-name"
-            v-model="fields.signUpName"
+            v-model.trim="fields.signUpName"
             type="text"
             placeholder="Must be at least 5 characters"
           />
diff --git a/app/src/renderer/components/governance/ModalPropose.vue b/app/src/renderer/components/governance/ModalPropose.vue
index f6e9675538..99efa213e4 100644
--- a/app/src/renderer/components/governance/ModalPropose.vue
+++ b/app/src/renderer/components/governance/ModalPropose.vue
@@ -14,7 +14,7 @@
       <tm-field
         v-focus
         id="title"
-        v-model="title"
+        v-model.trim="title"
         type="text"
         placeholder="Proposal title"
       />
@@ -32,7 +32,7 @@
       <span>Description</span>
       <tm-field
         id="description"
-        v-model="description"
+        v-model.trim="description"
         type="textarea"
         placeholder="Write your proposal here..."
       />