diff --git a/htdocs/theme/raw/templates/collectionnav.tpl b/htdocs/theme/raw/templates/collectionnav.tpl
index 4ce7815..d028c6b 100644
--- a/htdocs/theme/raw/templates/collectionnav.tpl
+++ b/htdocs/theme/raw/templates/collectionnav.tpl
@@ -1,25 +1,35 @@
 {foreach from=$collection item=chunk name=cchunk}
-<div class="{if $dwoo.foreach.cchunk.first}colnav1{else}colnav-extra hidden{/if}">
-<ul class="colnav">
-  {foreach from=$chunk item=view}
-  <li{if $view->view == $viewid} class="selected"{/if}>
-      {if $view->view != $viewid}
-          <a href="{$WWWROOT}view/view.php?id={$view->view}">{$view->title|str_shorten_text:30:true}</a>
-      {else}
-          <span>{$view->title|str_shorten_text:30:true}</span>
+    {if $dwoo.foreach.cchunk.first}
+        {$colnavclass="colnav1"}
+    {else}
+        {$colnavclass="colnav-extra hidden"}
+    {/if}
+    <div class="{$colnavclass}">
+    <ul class="colnav">
+      {foreach from=$chunk item=view}
+      <li{if $view->view == $viewid} {if $colnavclass=="colnav-extra hidden"}{$extraselected=true}{/if} class="selected"{/if}>
+          {if $view->view != $viewid}
+              <a href="{$WWWROOT}view/view.php?id={$view->view}">{$view->title|str_shorten_text:30:true}</a>
+          {else}
+              <span>{$view->title|str_shorten_text:30:true}</span>
+          {/if}
+      </li>
+      {/foreach}
+      {if $dwoo.foreach.cchunk.first && !$dwoo.foreach.cchunk.last}
+      <li id="colnav-more" class="nojs-hidden"><a href="">…</a></li>
       {/if}
-  </li>
-  {/foreach}
-  {if $dwoo.foreach.cchunk.first && !$dwoo.foreach.cchunk.last}
-  <li id="colnav-more" class="nojs-hidden"><a href="">…</a></li>
-  {/if}
-</ul>
-</div>
+    </ul>
+    </div>
 {/foreach}
 
 {if $dwoo.foreach.cchunk.index > 1}
 <script>{literal}
 addLoadEvent(function() {
+    {/literal}
+    {if $extraselected}
+        {literal}forEach (getElementsByTagAndClassName('div', 'colnav-extra', null), partial(toggleElementClass, 'hidden'));{/literal}
+    {/if}
+    {literal}
     connect('colnav-more', 'onclick', function(e) {
         e.stop();
         forEach (getElementsByTagAndClassName('div', 'colnav-extra', null), partial(toggleElementClass, 'hidden'));