diff --git a/src/lib/tabs/tab-group.scss b/src/lib/tabs/tab-group.scss
index cbd42d7388f0..f542ce9048d7 100644
--- a/src/lib/tabs/tab-group.scss
+++ b/src/lib/tabs/tab-group.scss
@@ -29,7 +29,6 @@
   }
 }
 
-.mat-tab-group[mat-stretch-tabs] .mat-tab-label,
 .mat-tab-group[mat-stretch-tabs] .mat-tab-label {
   flex-basis: 0;
   flex-grow: 1;
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss b/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss
index 8fe9274aea88..fce473be3d97 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss
@@ -8,6 +8,7 @@
 
 .mat-tab-links {
   position: relative;
+  display: flex;
 }
 
 // Wraps each link in the header
@@ -17,8 +18,14 @@
   text-decoration: none;  // Removes anchor underline styling
   position: relative;
   overflow: hidden;  // Keeps the ripple from extending outside the element bounds
+
+  [mat-stretch-tabs] & {
+    flex-basis: 0;
+    flex-grow: 1;
+  }
 }
 
+
 @media ($mat-xsmall) {
   .mat-tab-link {
     min-width: 72px;