diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php
index 9506ee32f0d14..dc0805fef3a7b 100644
--- a/components/com_tags/tmpl/tags/default_items.php
+++ b/components/com_tags/tmpl/tags/default_items.php
@@ -87,7 +87,7 @@ class="inputbox"
         </div>
     <?php else : ?>
         <?php foreach ($this->items as $i => $item) : ?>
-            <?php if ($n === 1 || $i === 0 || $bscolumns === 1 || $i % $bscolumns === 0) : ?>
+            <?php if ($i === 0 || ($bscolumns > 1 && $i % $bscolumns === 0)) : ?>
                 <ul class="com-tags__category category list-group">
             <?php endif; ?>
 
@@ -133,7 +133,7 @@ class="inputbox"
                 <?php endif; ?>
             </li>
 
-            <?php if (($i === 0 && $n === 1) || $i === $n - 1 || $bscolumns === 1 || (($i + 1) % $bscolumns === 0)) : ?>
+            <?php if ($i === $n - 1 || ($bscolumns > 1 && ($i + 1) % $bscolumns === 0)) : ?>
                 </ul>
             <?php endif; ?>