diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index 481d272290a..5eaed4fd1ff 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -18,18 +18,14 @@
   
 function afterLoadClusterJSP($midmenuItem1) {
     showMiddleMenu();
-        
-    //$("#midmenu_add_link").unbind("click").hide();              
-    //$("#midmenu_add2_link").unbind("click").hide();   
-        
-    //???
+     
     initAddHostButton($("#midmenu_add_link"), "cluster_page"); 
     initAddPrimaryStorageButton($("#midmenu_add2_link"), "cluster_page");  
     $("#midmenu_add3_link").unbind("click").hide();   
     
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");    
-    //???       
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	       
     
 	clusterJsonToRightPanel($midmenuItem1);	
 	var clusterId = $midmenuItem1.data("jsonObj").id;            
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 2435c7d3db6..3af4c73a02e 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -44,6 +44,7 @@ function afterLoadHostJSP($midmenuItem1) {
 
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	     
     initDialog("dialog_confirmation_enable_maintenance");
     initDialog("dialog_confirmation_cancel_maintenance");
     initDialog("dialog_confirmation_force_reconnect");
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 42887f1c075..af808424999 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -28,7 +28,7 @@
     // if hypervisor is KVM, limit the server option to NFS for now
     if (getHypervisorType() == 'kvm') 
 	    $("#dialog_add_pool").find("#add_pool_protocol").empty().html('<option value="nfs">NFS</option>');	
-    bindEventHandlerToDialogAddPool();	 
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	 
     
     //switch between different tabs 
     var tabArray = [$("#tab_details"), $("#tab_network")];
@@ -649,14 +649,15 @@ function iscsiURL(server, iqn, lun) {
 	return url;
 }
 
-function bindEventHandlerToDialogAddPool() {    
-    $("#dialog_add_pool").find("#add_pool_protocol").change(function(event) {
+function bindEventHandlerToDialogAddPool($dialogAddPool) { 
+    $dialogAddPool.find("#add_pool_protocol").change(function(event) {        
 		if ($(this).val() == "iscsi") {
-			$("#dialog_add_pool #add_pool_path_container").hide();
-			$("#dialog_add_pool #add_pool_iqn_container, #dialog_add_pool #add_pool_lun_container").show();
-		} else {
-			$("#dialog_add_pool #add_pool_path_container").show();
-			$("#dialog_add_pool #add_pool_iqn_container, #dialog_add_pool #add_pool_lun_container").hide();
+			$dialogAddPool.find("#add_pool_path_container").hide();
+			$dialogAddPool.find("#add_pool_iqn_container,#add_pool_lun_container").show();
+		} 
+		else if ($(this).val() == "nfs") {
+			$dialogAddPool.find("#add_pool_path_container").show();
+			$dialogAddPool.find("#add_pool_iqn_container,#add_pool_lun_container").hide();
 		}
 	});		
 }
diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
index a05c1dd4685..9188c921827 100644
--- a/ui/scripts/cloud.core.primarystorage.js
+++ b/ui/scripts/cloud.core.primarystorage.js
@@ -44,6 +44,7 @@ function primarystorageToRightPanel($midmenuItem1) {
     
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	     
     initDialog("dialog_confirmation_delete_primarystorage");
      
     $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);    
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index c14c15ef1d4..a919d78cf0d 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -974,7 +974,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
     // if hypervisor is KVM, limit the server option to NFS for now
     if (getHypervisorType() == 'kvm') 
 	    $dialogAddPool.find("#add_pool_protocol").empty().html('<option value="nfs">NFS</option>');	
-    bindEventHandlerToDialogAddPool();	
+    bindEventHandlerToDialogAddPool($dialogAddPool);	
     
     $.ajax({
         data: createURL("command=listZones&available=true"),