diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9db396552..cfcb23676 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -7,6 +7,7 @@
 - **Project** - Express/Custom install now let you specify the outputted file permissions and RTL use
 
 **Enhancements**
+- **Grid** - Grid's ``equal height row` now uses a combination of `flexbox` and ``display: table-cell`` for older browsers
 - **Sidebar** - Having a sidebar visible on page load is now much simpler. You can include ``ui visible sidebar`` on page load to have a sidebar element appear on page load. To close call `$('.ui.sidebar').sidebar('hide')`
 - **Dropdown** - New `upward dropdown` variation, which opens its menu upward. Default animation now uses ``settings.transition = 'auto'` and determines direction of animation based on menu direction
 - **Dropdown** - Dropdown matching fields without values now trims whitespace by default
diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index 4c06e0e83..4a6bae739 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -1393,21 +1393,24 @@
 /*----------------------
   Equal Height Columns
 -----------------------*/
+
 .ui[class*="equal height"].grid {
   display: table;
-  table-layout: fixed;
 }
-
 .ui[class*="equal height"].grid > .row,
-.ui[class*="equal height"].row  {
+.ui.grid > [class*="equal height"].row  {
   display: table;
   table-layout: fixed;
+  display: flex;
+  flex-direction: row;
   width: 100% !important;
 }
 .ui[class*="equal height"].grid > .column,
 .ui[class*="equal height"].grid > .row > .column,
 .ui.grid > [class*="equal height"].row > .column {
   display: table-cell;
+  display: inline-flex;
+  flex: 1 0 auto;
 }