diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index 68527e6d0..b87d2774c 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -200,9 +200,11 @@
         </core-tab>
     </core-tabs>
 
-    <div collapsible-footer *ngIf="!showLoading" slot="fixed">
+    <div collapsible-footer *ngIf="!showLoading" slot="fixed" [ngClass]="{ 'ion-margin-bottom': showSpinner }">
         <div class="list-item-limited-width" *ngIf="!canViewReports && ((lesson && !preventReasons.length) || retakeToReview)">
-            <ng-container *ngTemplateOutlet="buttons" />
+            <core-loading [hideUntil]="!showSpinner">
+                <ng-container *ngTemplateOutlet="buttons" />
+            </core-loading>
         </div>
 
         <core-course-module-navigation [courseId]="courseId" [currentModuleId]="module.id" />