diff --git a/application/view/templates/navigation.tpl b/application/view/templates/navigation.tpl
index a309b59..a731681 100644
--- a/application/view/templates/navigation.tpl
+++ b/application/view/templates/navigation.tpl
@@ -6,16 +6,16 @@
         <ul class="nav nav-pills iconav-nav">
             {foreach $navigationJson as $naventry}
                 <li >
-                    {if $naventry.onclick}
-                        <a title="{$naventry.tooltip}" data-toggle="tooltip" data-placement="right" data-container="body" onclick="{$naventry.onclick}">
-                            <span class="{$naventry.icon}"></span>
-                            <small class="iconav-nav-label visible-xs-block">{$naventry.title}</small>
-                        </a>
-                    {elseif $naventry.link}
-                        <a href="{$naventry.link}" title="{$naventry.tooltip}" data-toggle="tooltip" data-placement="right" data-container="body">
-                            <span class="{$naventry.icon}"></span>
-                            <small class="iconav-nav-label visible-xs-block">{$naventry.title}</small>
-                        </a>
+                    {if 'onclick'|array_key_exists:$naventry}
+                            <a title="{$naventry.tooltip}" data-toggle="tooltip" data-placement="right" data-container="body" onclick="{$naventry.onclick}">
+                                <span class="{$naventry.icon}"></span>
+                                <small class="iconav-nav-label visible-xs-block">{$naventry.title}</small>
+                            </a>
+                    {elseif 'link'|array_key_exists:$naventry}
+                            <a href="{$naventry.link}" title="{$naventry.tooltip}" data-toggle="tooltip" data-placement="right" data-container="body">
+                                <span class="{$naventry.icon}"></span>
+                                <small class="iconav-nav-label visible-xs-block">{$naventry.title}</small>
+                            </a>
                     {/if}
                 </li>
             {/foreach}