diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 3210399fb..859291287 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -164,8 +164,9 @@
                             <ion-radio slot="end" [value]="1"></ion-radio>
                         </ion-item>
                         <ion-item>
+                            <ion-label position="stacked"></ion-label>
                             <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                                [placeholder]="'addon.calendar.durationuntil' | translate" slot="end"
+                                [placeholder]="'addon.calendar.durationuntil' | translate"
                                 [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"
                                 display-timezone="utc">
                             </ion-datetime>
diff --git a/src/core/features/comments/components/comments/core-comments.html b/src/core/features/comments/components/comments/core-comments.html
index a3fe16111..250109e6f 100644
--- a/src/core/features/comments/components/comments/core-comments.html
+++ b/src/core/features/comments/components/comments/core-comments.html
@@ -13,15 +13,15 @@
         [detail]="!countError && commentsLoaded"
         (click)="openComments($event)"
         [disabled]="countError">
-        <core-loading [hideUntil]="commentsLoaded" [fullscreen]="false">
             <ion-label>
-                <p *ngIf="!countError" class="item-heading">
-                    {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
-                </p>
-                <p *ngIf="countError">
-                    {{ 'core.comments.commentsnotworking' | translate }}
-                </p>
+                <core-loading [hideUntil]="commentsLoaded" [fullscreen]="false">
+                    <p *ngIf="!countError" class="item-heading">
+                        {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
+                    </p>
+                    <p *ngIf="countError">
+                        {{ 'core.comments.commentsnotworking' | translate }}
+                    </p>
+                </core-loading>
             </ion-label>
-        </core-loading>
     </ion-item>
 </ng-container>