diff --git a/src/javascript/enhancements/lists.js b/src/javascript/enhancements/lists.js
index eb6ffa6..330bc1d 100644
--- a/src/javascript/enhancements/lists.js
+++ b/src/javascript/enhancements/lists.js
@@ -19,11 +19,11 @@ function addListHorizontalSeparators(node) {
     }
 
     // are we target tag?
-    if (node.tagName === targetTagName) {
+    if (node.tagName === targetTagName && typeof element.nextSibling !== "undefined") {
         updateFunc(node);
     } else {
         // find items -> all 
-        let requestItems = node.querySelectorAll('md-list-item');
+        let requestItems = node.querySelectorAll('md-list-item:not(:last-child)');
 
         // update borders
         requestItems.forEach(item => {