diff --git a/ui/index.jsp b/ui/index.jsp
index 2b1dae97b5e..b9aa6377781 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -448,7 +448,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="leftmenu_expandedlist">
+                                <div class="leftmenu_expandedlist" id="leftmenu_submenu_community_template_container" style="display: none">
                                     <div class="leftmenu_content" id="leftmenu_submenu_community_template">
                                         <div class="leftmenu_thirdindent">
                                             <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
@@ -490,7 +490,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="leftmenu_expandedlist">
+                                <div class="leftmenu_expandedlist" id="leftmenu_submenu_community_iso_container" style="display: none">
                                     <div class="leftmenu_content" id="leftmenu_submenu_community_iso">
                                         <div class="leftmenu_thirdindent">
                                             <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 3c6e881b4e4..eed624477e2 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1157,6 +1157,13 @@ function showLeftNavigationBasedOnRole() {
 	else {
 	    $("#leftmenu_security_group_container").hide();
 	}
+	
+	if (getUserPublicTemplateEnabled() == "true") {
+	    $("#leftmenu_submenu_community_template_container, #leftmenu_submenu_community_iso_container").show();
+	}
+	else {
+	    $("#leftmenu_submenu_community_template_container, #leftmenu_submenu_community_iso_container").hide();
+	}
 }
    
 function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having % inside)