diff --git a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js
index f3e6fce734192e..02b14e1979135c 100644
--- a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js
+++ b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js
@@ -25,13 +25,12 @@ export const styles = theme => ({
   /* Styles applied to the tag elements, e.g. the chips. */
   tag: {
     margin: 3,
-    '&:last-child': {
-      marginRight: 5,
-    },
+    maxWidth: 'calc(100% - 6px)',
   },
   /* Styles applied to the tag elements, e.g. the chips if `size="small"`. */
   tagSizeSmall: {
     margin: 2,
+    maxWidth: 'calc(100% - 4px)',
   },
   /* Styles applied to the Input element. */
   inputRoot: {