diff --git a/server/documents/elements/divider.html.eco b/server/documents/elements/divider.html.eco
index 7caa5a713..72820f01e 100755
--- a/server/documents/elements/divider.html.eco
+++ b/server/documents/elements/divider.html.eco
@@ -37,7 +37,7 @@ themes      : ['default']
   <div class="example">
     <h4 class="ui header">Vertical Divider</h4>
     <p>A divider can segment content vertically</p>
-    <div class="ui two column middle aligned relaxed fitted grid basic segment">
+    <div class="ui two column middle aligned relaxed fitted stackable grid">
       <div class="column">
         <div class="ui form segment">
           <div class="field">
diff --git a/src/definitions/elements/divider.less b/src/definitions/elements/divider.less
index ce1e89be3..4fee9ad04 100755
--- a/src/definitions/elements/divider.less
+++ b/src/definitions/elements/divider.less
@@ -132,6 +132,47 @@
   bottom: 0px;
 }
 
+/* Inside grid */
+@media only screen and (max-width : (@tabletBreakpoint - 1px)) {
+  .ui.stackable.grid .ui.vertical.divider,
+  .ui.grid .stackable.row .ui.vertical.divider {
+    position: relative;
+    margin: @dividerMargin;
+    left: 0;
+    height: auto;
+    overflow: hidden;
+    line-height: 1;
+    text-align: center;
+  }
+
+  .ui.stackable.grid .ui.vertical.divider:before,
+  .ui.grid .stackable.row .ui.vertical.divider:before,
+  .ui.stackable.grid .ui.vertical.divider:after,
+  .ui.grid .stackable.row .ui.vertical.divider:after {
+    position: absolute;
+    top: 50%;
+    left: auto;
+    content: '';
+    z-index: 3;
+
+    width: 50%;
+    top: 50%;
+    height: 0px;
+
+    border-top: @shadowWidth solid @shadowColor;
+    border-bottom: @highlightWidth solid @highlightColor;
+  }
+
+  .ui.stackable.grid .ui.vertical.divider:before,
+  .ui.grid .stackable.row .ui.vertical.divider:before {
+    margin-left: -(50% + @horizontalDividerMargin);
+  }
+  .ui.stackable.grid .ui.vertical.divider:after,
+  .ui.grid .stackable.row .ui.vertical.divider:after {
+    margin-left: @horizontalDividerMargin;
+  }
+}
+
 /*--------------
       Icon
 ---------------*/