diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp
index 566c3fc5633..07bbe3ff718 100644
--- a/ui/new/jsp/template.jsp
+++ b/ui/new/jsp/template.jsp
@@ -24,16 +24,13 @@
             <%=t.t("Details")%></div>
     </div>    
     <div id="tab_content_details">
-        <div class="grid_actionpanel">
-            
-            <div class="grid_editbox" id="edit_button">
-            </div>
+        <div class="grid_actionpanel">            
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="Div1">
                 </div>
                 <p id="description">
-                    Detaching Disk &hellip;</p>
+                    Waiting &hellip;</p>
             </div>               
         </div>
     
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index 6ad6ac2bbcd..b5b1f881e0a 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -119,11 +119,6 @@ function afterLoadTemplateJSP() {
         return false;
     });
     
-    //edit button ***
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #isfeatured, #ostypename");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit");     
-    initializeEditFunction($readonlyFields, $editFields, doUpdateTemplate);      
-    
     //populate dropdown ***   			
 	var addTemplateZoneField = $("#dialog_add_template #add_template_zone");    	
 	if (isAdmin())  
@@ -286,10 +281,11 @@ function templateJsonToDetailsTab(jsonObj) {
     // action Edit, Copy, Create VM 			
 	if ((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.id==DomRTemplateId || jsonObj.isready == "false") {
 		//template.find("#template_edit_container, #template_copy_container, #template_create_vm_container").hide(); 
-		$("#edit_button").hide();		
+		//$("#edit_button").hide();		
     }
     else {
-        $("#edit_button").show();
+        buildActionLinkForDetailsTab("Edit Template", templateActionMap, $actionMenu, midmenuItemId);      
+        //$("#edit_button").show();
         buildActionLinkForDetailsTab("Copy Template", templateActionMap, $actionMenu, midmenuItemId);			
         buildActionLinkForDetailsTab("Create VM", templateActionMap, $actionMenu, midmenuItemId);	
         noAvailableActions = false;		
@@ -360,6 +356,9 @@ function templateClearDetailsTab() {
 }
 
 var templateActionMap = {  
+    "Edit Template": {
+        dialogBeforeActionFn : doEditTemplate  
+    },
     "Delete Template": {              
         isAsyncJob: true,
         asyncJobResponse: "deletetemplateresponse",
@@ -392,9 +391,31 @@ var templateActionMap = {
 var DomRTemplateId = 1;
 
 
-function doUpdateTemplate() {    
-    var $detailsTab = $("#right_panel_content #tab_content_details");  
-            
+function doEditTemplate() {   
+    var $detailsTab = $("#right_panel_content #tab_content_details");  
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #isfeatured, #ostypename");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit");    
+        
+    $readonlyFields.hide();
+    $editFields.show();  
+    $detailsTab.find("#cancel_button, #save_button").show();
+    
+    $detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){    
+        $editFields.hide();
+        $readonlyFields.show();   
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });
+    $detailsTab.find("#save_button").unbind("click").bind("click", function(event){        
+        doEditTemplate2($detailsTab);     
+        $editFields.hide();      
+        $readonlyFields.show();       
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });   
+}
+
+function doEditTemplate2($detailsTab) {               
     // validate values
     var isValid = true;					
     isValid &= validateString("Name", $detailsTab.find("#name_edit"), $detailsTab.find("#name_edit_errormsg"));