diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index cad42fd53..4b29383f7 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -130,6 +130,12 @@
   margin: (@rowSpacing / 2) (@gutterWidth / 2);
 }
 
+/* remove Border on last horizontal segment */
+.ui.grid > .row > .column:last-child > .horizontal.segment,
+.ui.grid > .column:last-child > .horizontal.segment {
+  box-shadow: none;
+}
+
 /*******************************
            Variations
 *******************************/
diff --git a/src/definitions/elements/segment.less b/src/definitions/elements/segment.less
index 8572f5c90..35b7bb5ef 100755
--- a/src/definitions/elements/segment.less
+++ b/src/definitions/elements/segment.less
@@ -85,7 +85,6 @@
   padding-left: 0em;
 }
 .ui.horizontal.segment:last-child {
-  box-shadow: none;
   padding-right: 0em;
 }