diff --git a/src/core/features/course/pages/course-summary/course-summary.html b/src/core/features/course/pages/course-summary/course-summary.html
index 56baec734..46926639f 100644
--- a/src/core/features/course/pages/course-summary/course-summary.html
+++ b/src/core/features/course/pages/course-summary/course-summary.html
@@ -26,14 +26,23 @@
         <ng-container *ngIf="course">
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <p *ngIf="course.categoryname">
-                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                    <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname"
+                        class="core-course-shortname">
+                        <core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </p>
                     <h2>
+                        <span class="sr-only">{{ 'core.courses.aria:coursename' | translate }}</span>
                         <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id">
                         </core-format-text>
                     </h2>
+                    <ion-chip color="brand" *ngIf="course.categoryname" class="core-course-category ion-text-nowrap">
+                        <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
+                        <ion-label>
+                            <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                            </core-format-text>
+                        </ion-label>
+                    </ion-chip>
 
                     <div class="core-course-progress" *ngIf="progress !== undefined">
                         <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
diff --git a/src/core/features/course/pages/index/index.html b/src/core/features/course/pages/index/index.html
index 0187dc8e4..2a234b5d5 100644
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@@ -21,10 +21,6 @@
         <img [src]="imageThumb" core-external-content alt="" />
     </ion-avatar>
     <ion-label>
-        <p *ngIf="category">
-            <core-format-text [text]="category" contextLevel="coursecat" [contextInstanceId]="course!.categoryid">
-            </core-format-text>
-        </p>
         <h1>{{ title }}</h1>
         <div class="core-course-progress" *ngIf="progress !== undefined">
             <core-progress-bar [progress]="progress" a11yText="core.course.aria:sectionprogress">
diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts
index 56e10b136..c6b24df14 100644
--- a/src/core/features/course/pages/index/index.ts
+++ b/src/core/features/course/pages/index/index.ts
@@ -238,7 +238,6 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
 
         // Get the title to display initially.
         this.title = CoreCourseFormatDelegate.getCourseTitle(this.course);
-        this.category = 'categoryname' in this.course ? this.course.categoryname : '';
 
         if ('overviewfiles' in this.course) {
             this.imageThumb = this.course.overviewfiles?.[0]?.fileurl;
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 39bf2b5e2..fd2a803bc 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -70,7 +70,8 @@
                     class="core-course-category core-course-additional-info ion-text-nowrap">
                     <span class="sr-only">{{ 'core.courses.aria:coursecategory' | translate }}</span>
                     <ion-label>
-                        <core-format-text [text]="course.categoryname"></core-format-text>
+                        <core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid">
+                        </core-format-text>
                     </ion-label>
                 </ion-chip>
             </div>