diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts
index 1f8ebb2b9..865279a06 100644
--- a/src/addons/mod/book/pages/contents/contents.ts
+++ b/src/addons/mod/book/pages/contents/contents.ts
@@ -253,7 +253,7 @@ export class AddonModBookContentsPage implements OnInit, OnDestroy {
             componentProps: {
                 moduleId: this.cmId,
                 chapters: this.chapters,
-                selected: visibleChapter,
+                selected: visibleChapter?.id,
                 courseId: this.courseId,
                 book: this.book,
             },
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 d039f0303..a02bbbc11 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
@@ -7,16 +7,16 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="!showLoading">
+
+    <!-- Activity info. -->
+    <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
+        [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
+    </core-course-module-info>
+
     <core-tabs [hideUntil]="!showLoading" [selectedIndex]="selectedTab">
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
             <ng-template>
-
-                <!-- Activity info. -->
-                <core-course-module-info [module]="module" [description]="description" [component]="component" [componentId]="componentId"
-                    [courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
-                </core-course-module-info>
-
                 <!-- Prevent access messages. Only show the first one. -->
                 <ion-card class="core-info-card" *ngIf="lesson && preventReasons.length">
                     <ion-item>