diff --git a/src/app/courses/view-courses/courses-view-detail.component.ts b/src/app/courses/view-courses/courses-view-detail.component.ts
index f601c8857b..19aa3af0d2 100644
--- a/src/app/courses/view-courses/courses-view-detail.component.ts
+++ b/src/app/courses/view-courses/courses-view-detail.component.ts
@@ -66,5 +66,7 @@ export class CoursesViewDetailDialogComponent implements OnInit {
 
   routeToCourses(courseId) {
     this.router.navigate([ '../../courses/view/', courseId ], { relativeTo: this.route });
+    const url = this.router.serializeUrl(this.router.createUrlTree([ '../../courses/view/', courseId ], { relativeTo: this.route }));
+    window.open(url, '_blank');
   }
 }
diff --git a/src/app/teams/teams-view.component.html b/src/app/teams/teams-view.component.html
index b5a4817311..f54c2558c9 100644
--- a/src/app/teams/teams-view.component.html
+++ b/src/app/teams/teams-view.component.html
@@ -215,7 +215,14 @@ <h4 i18n>Members ({{members.length}})</h4>
           <p *ngIf="team?.courses?.length < 1; else courseList" i18n>There are no courses associated with this team.</p>
           <ng-template #courseList>
             <div class="card-grid">
-              <mat-card *ngFor="let course of team?.courses" (click)="openCourseView(course._id)" class="cursor-pointer">
+              <mat-card
+                        *ngFor="let course of team?.courses"
+                        (click)="course._id ? openCourseView(course._id) : false"
+                        [ngClass]="{ 'cursor-pointer': !!course._id }"
+                        i18n-matTooltip
+                        matTooltip="Course data unavailable"
+                        [matTooltipDisabled]="!!course._id"
+                      >
                 <div class="mat-subheading-2">
                   <b>{{course.courseTitle | truncateText:75}}</b>
                 </div>