diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 936b6ddc110a9a1a1810b1c829e1d1ade4c1b3e4..475534bbef09ae186c5fa54428b9a4b9400c48d5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,6 +19,7 @@ Fixed
 
 * GroupManager.get_queryset() returned an incomplete QuerySet
 * OAuth was broken by a non-semver-adhering django-oauth-toolkit update
+* Too long texts in chips didn't result in a larger chip.
 
 Changed
 ~~~~~~~
diff --git a/aleksis/core/static/public/style.scss b/aleksis/core/static/public/style.scss
index bef226c7d4a8583cb2e925453c9a4a27293cd3f5..618b846dc956af8ed62db357f2867a9988b58846 100644
--- a/aleksis/core/static/public/style.scss
+++ b/aleksis/core/static/public/style.scss
@@ -377,6 +377,12 @@ span.badge .material-icons {
   margin-left: -2px;
 }
 
+.chip {
+  padding: 8px 12px;
+  height: auto;
+  line-height: 16px;
+}
+
 /*+++++++++*/
 /* Buttons */
 /*+++++++++*/