diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index fa24e806..bf68708d 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -13,9 +13,7 @@ function handleStop(buttonElement) {
 
 {if $show_navigation}
 <div class="optional-nav">
-  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>
-  {if $user->isPluginEnabled('pu')}&nbsp;/&nbsp;<a href="puncher.php">{$i18n.label.puncher}{/if}</a>
-  {if $user->isPluginEnabled('wv')}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}{/if}</a>
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>{if $user->isPluginEnabled('pu')}&nbsp;/&nbsp;<a href="puncher.php">{$i18n.label.puncher}</a>{/if}{if $user->isPluginEnabled('wv')}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>{/if}
 </div>
 {/if}
 
diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 6032d4eb..01234e19 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -20,7 +20,7 @@ function fillDropdowns() {
 
 {if $show_navigation}
 <div class="optional-nav">
-  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
+  <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>{if $user->isPluginEnabled('pu')}&nbsp;/&nbsp;<a href="puncher.php">{$i18n.label.puncher}</a>{/if}&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
 </div>
 {/if}