diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index b91eac15786..55cd5ad173f 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -107,6 +107,8 @@
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="tags">
 	                    </div>
+	                    <input class="text" id="tags_edit" style="width: 200px; display: none;" type="text" />
+	                    <div id="tags_edit_errormsg" style="display:none"></div>  
 	                </div>
 	            </div>
 	            <div class="grid_rows even">
diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index e566260584c..61b7861bd34 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -111,8 +111,8 @@ function initAddDiskOfferingButton($midmenuAddLink1) {
 }
 
 function doEditDiskOffering($actionLink, $detailsTab, $midmenuItem1) {       
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit"); 
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #tags");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #tags_edit"); 
              
     $readonlyFields.hide();
     $editFields.show();  
@@ -145,9 +145,13 @@ function doEditDiskOffering2($actionLink, $detailsTab, $midmenuItem1, $readonlyF
     var array1 = [];    
     var name = $detailsTab.find("#name_edit").val();
     array1.push("&name="+todb(name));
+    
     var displaytext = $detailsTab.find("#displaytext_edit").val();
     array1.push("&displayText="+todb(displaytext));
 	
+	var tags = $detailsTab.find("#tags_edit").val();
+	array1.push("&tags="+todb(tags));	
+	
 	$.ajax({
 	    data: createURL("command=updateDiskOffering&id="+id+array1.join("")),
 		dataType: "json",
@@ -214,7 +218,9 @@ function diskOfferingJsonToDetailsTab() {
     var diskSize = diskofferingGetDiskSize(jsonObj);   
     $thisTab.find("#disksize").text(diskSize);    
         
-    $thisTab.find("#tags").text(fromdb(jsonObj.tags));      
+    $thisTab.find("#tags").text(fromdb(jsonObj.tags));    
+    $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));    
+      
     $thisTab.find("#domain").text(fromdb(jsonObj.domain));   
     
     //actions ***