diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js/src/dapps/tokenreg/Inputs/Text/input-text.js
index 7bb8bc98b..0862c6443 100644
--- a/js/src/dapps/tokenreg/Inputs/Text/input-text.js
+++ b/js/src/dapps/tokenreg/Inputs/Text/input-text.js
@@ -105,22 +105,22 @@ export default class InputText extends Component {
     const { validationType, contract } = this.props;
     const validation = validate(value, validationType, contract);
 
-    if (validation instanceof Promise) {
+    const loadingTimeout = setTimeout(() => {
       this.setState({ disabled: true, loading: true });
+    }, 50);
 
-      return validation
-        .then(validation => {
-          this.setValidation({
-            ...validation,
-            disabled: false,
-            loading: false
-          });
+    return Promise.resolve(validation)
+      .then((validation) => {
+        clearTimeout(loadingTimeout);
 
-          event.target.focus();
+        this.setValidation({
+          ...validation,
+          disabled: false,
+          loading: false
         });
-    }
 
-    this.setValidation(validation);
+        event.target.focus();
+      });
   }
 
   onKeyDown = (event) => {
diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.css b/js/src/dapps/tokenreg/Tokens/Token/token.css
index cdd6b2b39..990a16fba 100644
--- a/js/src/dapps/tokenreg/Tokens/Token/token.css
+++ b/js/src/dapps/tokenreg/Tokens/Token/token.css
@@ -49,7 +49,7 @@
 }
 
 .token-container {
-  flex: 1;
+  flex: 1 1 auto;
 }
 
 .full-width .token-container {