diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 57b4eb6f4..fe0a30baa 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -183,7 +183,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label position="stacked">
-                        <p>{{ 'addon.calendar.repeatweeksl' | translate }}</p>
+                        <p class="item-heading">{{ 'addon.calendar.repeatweeksl' | translate }}</p>
                     </ion-label>
                     <ion-input type="number" name="repeats" formControlName="repeats" [disabled]="!form.controls.repeat.value">
                     </ion-input>
@@ -231,23 +231,17 @@
                 <ion-input type="text" name="location" [placeholder]="'core.location' | translate" formControlName="location">
                 </ion-input>
             </ion-item>
-
-            <ion-item>
-                <ion-label>
-                    <ion-row>
-                        <ion-col *ngIf="hasOffline && eventId && eventId < 0">
-                            <ion-button expand="block" fill="outline" (click)="discard()">
-                                {{ 'core.discard' | translate }}
-                            </ion-button>
-                        </ion-col>
-                        <ion-col>
-                            <ion-button expand="block" (click)="submit()" [disabled]="!form.valid" type="submit">
-                                {{ 'core.save' | translate }}
-                            </ion-button>
-                        </ion-col>
-                    </ion-row>
-                </ion-label>
-            </ion-item>
         </form>
+        <div collapsible-footer appearOnBottom *ngIf="loaded && !error" slot="fixed">
+            <div class="list-item-limited-width adaptable-buttons-row">
+                <ion-button *ngIf="hasOffline && eventId && eventId < 0" expand="block" fill="outline" (click)="discard()"
+                    class="ion-margin ion-text-wrap">
+                    {{ 'core.discard' | translate }}
+                </ion-button>
+                <ion-button expand="block" (click)="submit()" [disabled]="!form.valid" type="submit" class="ion-margin ion-text-wrap">
+                    {{ 'core.save' | translate }}
+                </ion-button>
+            </div>
+        </div>
     </core-loading>
 </ion-content>
diff --git a/src/core/directives/collapsible-footer.ts b/src/core/directives/collapsible-footer.ts
index 2dccfd760..e041fa096 100644
--- a/src/core/directives/collapsible-footer.ts
+++ b/src/core/directives/collapsible-footer.ts
@@ -146,7 +146,8 @@ export class CoreCollapsibleFooterDirective implements OnInit, OnDestroy {
                     ? this.finalHeight
                     : this.initialHeight;
 
-                this.setBarHeight(newHeight);            }
+                this.setBarHeight(newHeight);
+            }
         });
 
         this.resizeListener = CoreDomUtils.onWindowResize(() => {