diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 506fea6e4..7b0f32cf6 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -391,10 +391,10 @@
         </p>
     </ng-container>
     <p>
-        <ion-badge *ngIf="statusTranslated" [color]="statusColor">
+        <ion-badge *ngIf="statusTranslated" [color]="statusColor" class="ion-text-wrap ion-text-start">
             {{ statusTranslated }}
         </ion-badge>
-        <ion-badge class="ion-margin-start" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
+        <ion-badge class="ion-text-wrap ion-text-start" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
             {{ gradingStatusTranslationId | translate }}
         </ion-badge>
     </p>
diff --git a/src/addons/mod/assign/components/submission/submission.scss b/src/addons/mod/assign/components/submission/submission.scss
index 51e8c8838..935b96fe7 100644
--- a/src/addons/mod/assign/components/submission/submission.scss
+++ b/src/addons/mod/assign/components/submission/submission.scss
@@ -21,6 +21,11 @@
     .core-grading-summary .advancedgrade {
         display: none;
     }
+
+    ion-badge {
+        margin-left: 2px;
+        margin-right: 2px;
+    }
 }
 
 :host-context(body.dark) ::ng-deep {