diff --git a/templates/default/includes/menu.html b/templates/default/includes/menu.html
index 476e3ecd0..de39f9fe6 100644
--- a/templates/default/includes/menu.html
+++ b/templates/default/includes/menu.html
@@ -2,29 +2,45 @@
     <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
     <div class="block-content">
         <nav class="nav-categories">
-            <ul id="category" class="accordion">
-            {assign "previousLevel" 0}
-            {loop name="cat-parent" type="category-tree" category="0"}
-
-            {for $foo=1 to $previousLevel-$LEVEL}
-                    </ul>
-                </li>
-            {/for}
-
-            {if $CHILD_COUNT > 0 }
-            <li>
-                <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="{$URL}#collapse{$ID}">{$TITLE} <span class="amount">({$CHILD_COUNT})</span></a>
-                <ul id="collapse{$ID}" class="collapse">
-            {else}
-                <li><a href="{$URL}">{$TITLE} <span class="amount">(0)</span></a></li>
-            {/if}
-                {assign "previousLevel" $LEVEL}
+            {* define current ID *}
+            {loop name="current_cat" type="category" current="yes"}
+                {assign var="current_category_id" value="{$PARENT}"}
             {/loop}
-            {for $i=$previousLevel to 1 step -1}
+            {* define the function *}
+            {function menu level=0}
+                {if $level == 0}
+                    <ul  id="category" class="accordion">
+                    {else}
+                        {if $parent == $current_category_id}
+                            <ul id="collapse{$parent}" class="in">
+                            {else}
+                            <ul id="collapse{$parent}" class="collapse">
+                        {/if}
+                {/if}
+
+                    {loop name="cat-parent-$level" type="category" parent=$parent}
+
+                        {assign var="product_count" value="0"}
+                        {loop name="product_count" type="product" category="{$ID}"}
+                            {if $LOOP_COUNT == 1}
+                                {assign var="product_count" value="{$LOOP_TOTAL}"}
+                            {/if}
+                        {/loop}
+
+                            {if $CHILD_COUNT> 0}
+                                <li><a href="{$URL}#collapse{$ID}" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse{$ID}">{$TITLE} ({$PRODUCT_COUNT})</a>
+                                {menu parent=$ID level=$level+1}
+                                </li>
+                            {else}
+                                <li><a href="{$URL}">{$TITLE} ({$product_count})</a></li>
+                            {/if}
+                    {/loop}
+
                 </ul>
-            </li>
-            {/for}
-            </ul>
+            {/function}
+
+            {menu parent='0'}
+
         </nav>
     </div>
 </section>