diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index 9b4ae7ece61..b7d6ab38876 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -35,7 +35,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="grid_editbox">
+            <div class="grid_editbox" id="edit_button">
             </div>
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
@@ -79,6 +79,8 @@
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="name">
                     </div>
+                    <input class="text" id="name_edit" style="width: 200px; display: none;" type="text" />
+                    <div id="name_edit_errormsg" style="display:none"></div>
                 </div>
             </div>
             <div class="grid_rows odd">
@@ -89,6 +91,8 @@
                 <div class="grid_row_cell" style="width: 79%;">
                     <div class="row_celltitles" id="displaytext">
                     </div>
+                    <input class="text" id="displaytext_edit" style="width: 200px; display: none;" type="text" />
+                    <div id="displaytext_edit_errormsg" style="display:none"></div>
                 </div>
             </div>
             <div class="grid_rows odd">
@@ -140,8 +144,12 @@
                     <div class="row_celltitles" id="size">
                     </div>
                 </div>
-            </div>
-        </div>
+            </div> 
+        </div>        
+        <div class="grid_botactionpanel">
+        	<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
+            <div class="gridbot_buttons" id="cancel_button" style="display:none;">Cancel</div>
+        </div>  
     </div>
 </div>
 <!-- ISO detail panel (end) -->
diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index 3a7402a33b1..29d8aa643d9 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -4,6 +4,28 @@ var g_zoneNames = [];
 function afterLoadIsoJSP() {
     var $detailsTab = $("#right_panel_content #tab_content_details");   
     
+    //edit button ***
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit"); 
+    $("#edit_button").bind("click", function(event){    
+        $readonlyFields.hide();
+        $editFields.show();  
+        $("#cancel_button, #save_button").show()
+        return false;
+    });    
+    $("#cancel_button").bind("click", function(event){    
+        $editFields.hide();
+        $readonlyFields.show();   
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });
+    $("#save_button").bind("click", function(event){        
+        doUpdateIso();     
+        $editFields.hide();      
+        $readonlyFields.show();       
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });
     
     //populate dropdown ***
     $.ajax({
@@ -107,8 +129,13 @@ function isoJsonToDetailsTab(jsonObj) {
     $detailsTab.data("jsonObj", jsonObj);      
     $detailsTab.find("#id").text(fromdb(jsonObj.id));
     $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));
+    
     $detailsTab.find("#name").text(fromdb(jsonObj.name));
+    $detailsTab.find("#name_edit").val(fromdb(jsonObj.name));
+    
     $detailsTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
+    $detailsTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
+    
     $detailsTab.find("#account").text(fromdb(jsonObj.account));
     
     if(jsonObj.size != null)
@@ -197,6 +224,33 @@ var isoListAPIMap = {
     listAPIResponseObj: "iso"
 }; 
 
+function doUpdateIso() { 
+    var $detailsTab = $("#right_panel_content #tab_content_details");      
+    
+    // validate values
+    var isValid = true;					
+    isValid &= validateString("Name", $detailsTab.find("#name_edit"), $detailsTab.find("#name_edit_errormsg"));
+    isValid &= validateString("Display Text", $detailsTab.find("#displaytext_edit"), $detailsTab.find("#displaytext_edit_errormsg"));			
+    if (!isValid) 
+        return;
+       
+    var jsonObj = $detailsTab.data("jsonObj"); 
+	var id = jsonObj.id;
+							
+	var name = trim($detailsTab.find("#name_edit").val());
+	var displaytext = trim($detailsTab.find("#displaytext_edit").val());
+	
+	$.ajax({
+	    data: createURL("command=updateIso&id="+id+"&name="+todb(name)+"&displayText="+todb(displaytext)),
+		dataType: "json",
+		success: function(json) {	
+		    var jsonObj = json.updateisoresponse;
+		    isoToMidmenu(jsonObj, $("#midmenuItem_"+jsonObj.id)); 
+		    isoJsonToDetailsTab(jsonObj);						
+		}
+	});
+}
+
 function populateZoneFieldExcludeSourceZone(zoneField, excludeZoneId) {	  
     zoneField.empty();  
     if (g_zoneIds != null && g_zoneIds.length > 0) {