diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
index 14a1bfbfe..8a3903715 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
@@ -42,46 +42,57 @@
 			});			
 		});
 		
-		$('#nav_tabs_modules_installed').click( function () {
-			$('#tab_modules_list_not_installed').hide();
-			$('#tab_modules_list_installed').show();
-			$(this).parent('li').addClass('active');
-			$('#nav_tabs_modules_not_installed').parent('li').removeClass('active');
-			return false;
-		});
-		
-		$('#nav_tabs_modules_not_installed').click( function () {
-			$('#tab_modules_list_installed').hide();
-			$('#tab_modules_list_not_installed').show();
-			$(this).parent('li').addClass('active');
-			$('#nav_tabs_modules_installed').parent('li').removeClass('active');
-			return false;
-		});
+		$('#nav_tabs_modules_installed').click(function () { showInstalledModules() });
+		$('#nav_tabs_modules_not_installed').click(function () { showNotInstalledModules() });
+
+		{if count($tab_modules_list.installed)}
+			showInstalledModules();
+		{else}
+			showNotInstalledModules();
+		{/if}
 	});
+	
+	function showInstalledModules(element)
+	{
+		$('#tab_modules_list_not_installed').hide();
+		$('#tab_modules_list_installed').show();
+		$('#nav_tabs_modules_installed').parent('li').addClass('active');
+		$('#nav_tabs_modules_not_installed').parent('li').removeClass('active');
+		return false;
+	}
+	
+	function showNotInstalledModules(element)
+	{
+		$('#tab_modules_list_installed').hide();
+		$('#tab_modules_list_not_installed').show();
+		$(element).parent('li').addClass('active');
+		$('#nav_tabs_modules_not_installed').parent('li').removeClass('active');
+		return false;
+	}
 </script>
 	<ul class="nav-tabs-modules">
-	  <li class="active"><a id="nav_tabs_modules_installed" href="#" onclick="">{l s='Installed'}</a></li>
-	  <li><a href="#" id="nav_tabs_modules_not_installed" >{l s='Not Installed'}</a></li>
+	{if count($tab_modules_list.installed)}
+		<li><a id="nav_tabs_modules_installed" href="#" onclick="">{l s='Installed'}</a></li>
+	{/if}
+	{if count($tab_modules_list.not_installed)}
+		<li><a href="#" id="nav_tabs_modules_not_installed" >{l s='Not Installed'}</a></li>
+	{/if}
 	</ul>
 	<div id="modules_list_container_content" style="clear:both">
-		<table id="tab_modules_list_installed" style="clear:both">
-			{if count($tab_modules_list.installed)}
-				{foreach from=$tab_modules_list.installed item=module}
-					{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
-				{/foreach}
-			{else}
-				<tr><td><div style="font-weight:700;margin-top:20px">{l s='No modules available in this section.'}</b></td></tr>
-			{/if}
-		</table>
-		<table id="tab_modules_list_not_installed" style="display:none;clear:both">
-			{if count($tab_modules_list.not_installed)}
-				{foreach from=$tab_modules_list.not_installed item=module}
-					{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
-				{/foreach}
-			{else}
-				<tr><td><div style="font-weight:700;margin-top:20px">{l s='No modules available in this section.'}</b></td></tr>
-			{/if}
-		</table>
+	{if count($tab_modules_list.installed)}
+	<table id="tab_modules_list_installed" style="clear:both">
+		{foreach from=$tab_modules_list.installed item=module}
+			{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
+		{/foreach}
+	</table>
+	{/if}
+	{if count($tab_modules_list.not_installed)}
+	<table id="tab_modules_list_not_installed" style="display:none;clear:both">
+		{foreach from=$tab_modules_list.not_installed item=module}
+			{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
+		{/foreach}
+	</table>
+	{/if}
 	</div>
 {/if}
 <p style="text-align:right;text-decoration:underline;padding-right:10px"><a href="{$admin_module_favorites_view}" style="color:#666">{l s='More options'}</a></p>
\ No newline at end of file