diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index eee0fe990..015dde63f 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -148,7 +148,6 @@
                 .cp-team-list-name {
                     word-wrap: break-word;
                     min-width: 0;
-                    overflow: hidden;
                     white-space: pre-wrap;
                     text-overflow: ellipsis;
                     max-width: 250px;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 0c3132e33..48368a029 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -530,9 +530,9 @@ define([
         }
 
         content.push(h('h3', Messages.team_createLabel));
-        let label = h('label', { for: 'teamName' } , Messages.team_createName);
+        let label = h('label', { for: 'cp-team-name' } , Messages.team_createName);
         content.push(label);
-        let input = h('input', {type:'text', id:'teamName'});
+        let input = h('input', {type:'text', id:'cp-team-name', maxlength:50});
         content.push(input);
         var button = h('button.btn.btn-success', Messages.creation_create);
         content.push(h('br'));
@@ -546,9 +546,7 @@ define([
             var name = $(input).val();
             if (!name.trim()) { return; }
             Messages.team_nameTooLong = "Team name is too long"; // XXX
-            if(name.length > 50){
-                return UI.warn(Messages.team_nameTooLong);
-            }
+            if(name.length > 50) { return UI.warn(Messages.team_nameTooLong); }
             state = true;
             $spinner.show();
             APP.module.execCommand('CREATE_TEAM', {