diff --git a/stylesheets/commons/Table2.scss b/stylesheets/commons/Table2.scss
index 4cbad5af140..ceb6872ebab 100644
--- a/stylesheets/commons/Table2.scss
+++ b/stylesheets/commons/Table2.scss
@@ -7,23 +7,33 @@ $table2-cell-padding-x: 0.75rem;
 		background-color: var( --clr-background, #ffffff );
 		border-color: var( --clr-on-surface-light-primary-12 );
 		color: var( --clr-secondary-16 );
+		color-scheme: light;
 	}
 
 	.theme--dark & {
 		background-color: var( --clr-background, #121212 );
 		border-color: var( --clr-on-surface-dark-primary-12 );
 		color: var( --clr-secondary-100 );
+		color-scheme: dark;
 	}
 }
 
 .table2 {
 	display: block;
 	width: fit-content;
-	max-width: 100%;
+	max-width: stretch;
 	border: 1px solid;
 	border-radius: $table2-radius;
 	overflow: hidden;
 
+	@supports not ( max-width: stretch ) {
+		max-width: -webkit-fill-available;
+
+		@supports not ( max-width: -webkit-fill-available ) {
+			max-width: 100%;
+		}
+	}
+
 	@include table2-surface-colors();
 
 	&__container {