diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less
index ff0b2f189..8179ea97f 100644
--- a/themes/5ePhb.style.less
+++ b/themes/5ePhb.style.less
@@ -542,7 +542,7 @@ body {
 // *       CLASS TABLE
 // *****************************/
 .page .classTable{
-	th[colspan] {
+	th[colspan]:not([rowspan]) {
 		white-space : nowrap;
 	}
 	&.frame {
diff --git a/themes/5ePhbLegacy.style.less b/themes/5ePhbLegacy.style.less
index 65fff2ba0..d814d4036 100644
--- a/themes/5ePhbLegacy.style.less
+++ b/themes/5ePhbLegacy.style.less
@@ -408,9 +408,6 @@ body {
 	border-image-slice  : 150 200 150 200;
 	border-image-source : @frameBorderImage;
 	border-image-width  : 47px;
-	th[colspan] {
-		white-space : nowrap;
-	}
 	h5{
 		margin-bottom : 10px;
 	}