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 e82d0d9c3..ab0d8373c 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
@@ -161,7 +161,9 @@
                         </ion-label>
                         <ion-select [(ngModel)]="group" (ionChange)="setGroup(group)" aria-labelledby="addon-mod_lesson-groupslabel"
                             interface="action-sheet">
-                            <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">{{groupOpt.name}}</ion-select-option>
+                            <ion-select-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">
+                                {{groupOpt.name}}
+                            </ion-select-option>
                         </ion-select>
                     </ion-item>
 
diff --git a/src/addons/mod/lesson/lesson-lazy.module.ts b/src/addons/mod/lesson/lesson-lazy.module.ts
index 4b9bb7f6f..41c85cdd7 100644
--- a/src/addons/mod/lesson/lesson-lazy.module.ts
+++ b/src/addons/mod/lesson/lesson-lazy.module.ts
@@ -17,12 +17,7 @@ import { RouterModule, Routes } from '@angular/router';
 
 const routes: Routes = [
     {
-        path: '',
-        redirectTo: 'index',
-        pathMatch: 'full',
-    },
-    {
-        path: 'index',
+        path: ':courseId/:cmdId',
         loadChildren: () => import('./pages/index/index.module').then( m => m.AddonModLessonIndexPageModule),
     },
     {
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html
index a6fa046c7..7554d3ae1 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html
@@ -111,7 +111,9 @@
                                         <!-- Content page, display a button and the content. -->
                                         <ion-row>
                                             <ion-col>
-                                                <ion-button expand="block" class="ion-text-wrap" color="light" [disabled]="true">{{ answer[0].buttonText }}</ion-button>
+                                                <ion-button expand="block" class="ion-text-wrap" color="light" [disabled]="true">
+                                                    {{ answer[0].buttonText }}
+                                                </ion-button>
                                             </ion-col>
                                             <ion-col>
                                                 <p [innerHTML]="answer[0].content"></p>
diff --git a/src/addons/mod/lesson/services/handlers/module.ts b/src/addons/mod/lesson/services/handlers/module.ts
index 008da58cf..e2413c3a8 100644
--- a/src/addons/mod/lesson/services/handlers/module.ts
+++ b/src/addons/mod/lesson/services/handlers/module.ts
@@ -79,9 +79,10 @@ export class AddonModLessonModuleHandlerService implements CoreCourseModuleHandl
             action: (event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions) => {
                 options = options || {};
                 options.params = options.params || {};
-                Object.assign(options.params, { module, courseId });
+                Object.assign(options.params, { module });
+                const routeParams = '/' + courseId + '/' + module.id;
 
-                CoreNavigator.instance.navigateToSitePath(AddonModLessonModuleHandlerService.PAGE_NAME, options);
+                CoreNavigator.instance.navigateToSitePath(AddonModLessonModuleHandlerService.PAGE_NAME + routeParams, options);
             },
         };
     }