diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index c7dd4ec0c87..df7a6b65438 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -928,7 +928,13 @@ tr.flagged-tag a {
     margin-right: 30px;
 }
 
-.userenrolment .col_role .role,
+.userenrolment .col_role .role {
+    float: left;
+    padding: 0 3px 3px;
+    margin: 0 3px 3px;
+    white-space: nowrap;
+}
+
 .userenrolment .col_group .group {
     float: left;
     padding: 3px;
@@ -964,8 +970,8 @@ tr.flagged-tag a {
 
 .userenrolment .col_enrol .enrolment {
     float: left;
-    padding: 3px;
-    margin: 3px;
+    padding: 0 3px 3px;
+    margin: 0 3px 3px;
 }
 
 .userenrolment .col_enrol .enrolment a {
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 101740b8b50..5153c08d554 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -972,7 +972,12 @@ tr.flagged-tag a {
 .userenrolment .col_group .groups {
     margin-right: 30px;
 }
-.userenrolment .col_role .role,
+.userenrolment .col_role .role {
+    float: left;
+    padding: 0 3px 3px;
+    margin: 0 3px 3px;
+    white-space: nowrap;
+}
 .userenrolment .col_group .group {
     float: left;
     padding: 3px;
@@ -1004,8 +1009,8 @@ tr.flagged-tag a {
 
 .userenrolment .col_enrol .enrolment {
     float: left;
-    padding: 3px;
-    margin: 3px;
+    padding: 0 3px 3px;
+    margin: 0 3px 3px;
 }
 .userenrolment .col_enrol .enrolment a {
     float: right;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index fefb0e8d655..ccddcc9955f 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -930,7 +930,12 @@ tr.flagged-tag a {
 .userenrolment .col_group .groups {
   margin-right: 30px;
 }
-.userenrolment .col_role .role,
+.userenrolment .col_role .role {
+  float: left;
+  padding: 0 3px 3px;
+  margin: 0 3px 3px;
+  white-space: nowrap;
+}
 .userenrolment .col_group .group {
   float: left;
   padding: 3px;
@@ -961,8 +966,8 @@ tr.flagged-tag a {
 }
 .userenrolment .col_enrol .enrolment {
   float: left;
-  padding: 3px;
-  margin: 3px;
+  padding: 0 3px 3px;
+  margin: 0 3px 3px;
 }
 .userenrolment .col_enrol .enrolment a {
   float: right;