diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Table/styles.scss b/packages/strapi-plugin-content-manager/admin/src/components/Table/styles.scss
index 6ae5664f1f..e9785a6bd0 100755
--- a/packages/strapi-plugin-content-manager/admin/src/components/Table/styles.scss
+++ b/packages/strapi-plugin-content-manager/admin/src/components/Table/styles.scss
@@ -3,6 +3,7 @@
   border-collapse: initial;
   overflow: hidden;
   box-shadow: 0 2px 4px #E3E9F3;
+  table-layout: fixed;
 
   tr, th, td{
     border: none;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
index a67b4ce02a..ab0f8f7469 100755
--- a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
@@ -58,10 +58,14 @@ class TableRow extends React.Component {
     // Generate cells
     const cells = this.props.headers.map((header, i) => (
       <td key={i}>
-        {this.getDisplayedValue(
-          header.type,
-          this.props.record[header.name]
-        )}
+        <div className={styles.truncate}>
+          <div className={styles.truncated}>
+            {this.getDisplayedValue(
+              header.type,
+              this.props.record[header.name]
+            )}
+          </div>
+        </div>
       </td>
     ));
 
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/styles.scss b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/styles.scss
index 16fbfa12f0..f01f5dc497 100755
--- a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/styles.scss
+++ b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/styles.scss
@@ -18,6 +18,18 @@
   }
 }
 
+.truncate {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+}
+
+.truncated {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .actions {
   text-align: right;
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/index.js
index 8c86525638..f090aad245 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpRelations/index.js
@@ -68,7 +68,7 @@ class PopUpRelations extends React.Component { // eslint-disable-line react/pref
     <ModalBody className={`${styles.modalBodyAdvanced}`}>
       <div className="container-fluid">
         <div className="row">
-          {map(take(this.props.form.items, 2), (input, key) => (
+          {map(take(this.props.form.items, 1), (input, key) => (
             <Input
               key={key}
               type={input.type}
@@ -153,7 +153,7 @@ class PopUpRelations extends React.Component { // eslint-disable-line react/pref
       : <Button type="submit" onClick={this.props.handleSubmit} className={styles.primary}><FormattedMessage id="content-type-builder.form.button.continue" /></Button>;
 
     const modalBody = this.props.showRelation ? this.renderModalBodyRelations():  this.renderModalBodyAdvanced();
-  
+
     return (
       <div className={styles.popUpRelations}>
         <Modal isOpen={this.props.isOpen} toggle={this.props.toggle} className={`${styles.modalPosition}`}>