diff --git a/src/app/container/files/files.component.html b/src/app/container/files/files.component.html
index 56085305e1..c5ba624f25 100644
--- a/src/app/container/files/files.component.html
+++ b/src/app/container/files/files.component.html
@@ -15,8 +15,11 @@
   -->
 
 <mat-tab-group mat-stretch-tabs>
+  <!-- Keep this as lazy loaded -->
   <mat-tab label="Dockerfile">
-    <app-dockerfile [entrypath]="entrypath" [id]="id" [selectedVersion]="selectedVersion" [publicPage]="publicPage"> </app-dockerfile>
+    <ng-template matTabContent>
+      <app-dockerfile [entrypath]="entrypath" [id]="id" [selectedVersion]="selectedVersion" [publicPage]="publicPage"> </app-dockerfile>
+    </ng-template>
   </mat-tab>
 
   <mat-tab label="Descriptor Files">
diff --git a/src/app/workflow/files/files.component.html b/src/app/workflow/files/files.component.html
index 7600b3f216..92083c7671 100644
--- a/src/app/workflow/files/files.component.html
+++ b/src/app/workflow/files/files.component.html
@@ -15,8 +15,11 @@
   -->
 
 <mat-tab-group mat-stretch-tabs>
+  <!-- Keep this as lazy loaded -->
   <mat-tab label="Descriptor Files">
-    <app-descriptors-workflow [entrypath]="entrypath" [id]="id" [selectedVersion]="selectedVersion"> </app-descriptors-workflow>
+    <ng-template matTabContent>
+      <app-descriptors-workflow [entrypath]="entrypath" [id]="id" [selectedVersion]="selectedVersion"> </app-descriptors-workflow>
+    </ng-template>
   </mat-tab>
   <mat-tab label="Test Parameter Files">
     <ng-template matTabContent>