diff --git a/ui/index.jsp b/ui/index.jsp
index 25669c564fe..e5fb559bcb1 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -458,7 +458,7 @@
                         <div id="leftmenu_itemplate_filter">
                             <div class="leftmenu_content" id="leftmenu_template_filter_header">
                                 <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                                    <div class="leftmenu_arrows expanded_open" id="template_arrow">
                                     </div>
                                     
                                     <fmt:message key="label.menu.templates"/>
@@ -500,7 +500,7 @@
                         <div id="leftmenu_iso_filter">
                             <div class="leftmenu_content" id="leftmenu_iso_filter_header">
                                 <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                                    <div class="leftmenu_arrows expanded_open" id="iso_arrow">
                                     </div>
                                     
                                     <fmt:message key="label.menu.isos"/>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 8c49dc8dd78..62d0a410910 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -291,6 +291,30 @@ $(document).ready(function() {
             					
 			return false;
 		});
+				
+		$("#template_arrow").unbind("click").bind("click", function(event) {	
+		    if($(this).hasClass("expanded_open")) { 
+		        $("#leftmenu_template_filter_container").hide();
+		        $(this).removeClass("expanded_open").addClass("expanded_close");
+		    }
+		    else if($(this).hasClass("expanded_close")) {
+		        $("#leftmenu_template_filter_container").show();
+		        $(this).removeClass("expanded_close").addClass("expanded_open");
+		    }
+		    return false;
+		});
+		
+		$("#iso_arrow").unbind("click").bind("click", function(event) {	
+		    if($(this).hasClass("expanded_open")) { 
+		        $("#leftmenu_iso_filter_container").hide();
+		        $(this).removeClass("expanded_open").addClass("expanded_close");
+		    }
+		    else if($(this).hasClass("expanded_close")) {
+		        $("#leftmenu_iso_filter_container").show();
+		        $(this).removeClass("expanded_close").addClass("expanded_open");
+		    }
+		    return false;
+		});
 		
 		//Setup domain
 		if (isAdmin() || isDomainAdmin()) {