diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 9fbcf20c558..c60340eef75 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1984,7 +1984,7 @@ public class ManagementServerImpl implements ManagementServer {
         }
 
         HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
-        return listTemplates(cmd.getId(), cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, accountId, cmd.getPageSizeVal().intValue(), cmd.getStartIndex(), cmd.getZoneId(), hypervisorType);
+        return listTemplates(cmd.getId(), cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, accountId, (cmd.getPageSizeVal() != null) ? cmd.getPageSizeVal().intValue() : null, cmd.getStartIndex(), cmd.getZoneId(), hypervisorType);
     }
 
     private List<VMTemplateVO> listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId, HypervisorType hyperType) throws InvalidParameterValueException {
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index d84ec471c31..30a31e76d77 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -144,6 +144,12 @@
 </div>
 <!-- Add Volume Dialog from Snapshot (end) -->
 
+<!-- snapshot confirmation dialog (begin) -->
+<div id="dialog_confirmation_delete_snapshot" title="Confirmation" style="display:none">
+    <p>Please confirm you want to delete the snapshot.</p>   
+</div>
+<!-- snapshot confirmation dialog (end) -->
+
 <!-- Create template from snapshot (begin) -->
 <div id="dialog_create_template_from_snapshot" title="Create Template from Snapshot" style="display:none">	
 	<div class="dialog_formcontent">
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index 0692baa712b..d7f8278b736 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -242,6 +242,12 @@
 </div>
 <!-- Create Snapshot Dialog (end) -->
 
+<!-- snapshot confirmation dialog (begin) -->
+<div id="dialog_confirmation_delete_snapshot" title="Confirmation" style="display:none">
+    <p>Please confirm you want to delete the snapshot.</p>   
+</div>
+<!-- snapshot confirmation dialog (end) -->
+
 <!-- Recurring Snapshots Dialog (begin) -->
 <div id="dialog_recurring_snapshot" title="Recurring Snapshot" style="display:none;">
     <div class="dialog_snapshotcontainer">
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index f7400383a2c..7a963b8fa11 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -19,7 +19,8 @@
 function afterLoadSnapshotJSP() {
     //initialize dialog
     initDialog("dialog_add_volume_from_snapshot");       
-    initDialog("dialog_create_template_from_snapshot", 400);    
+    initDialog("dialog_create_template_from_snapshot", 400);  
+	initDialog("dialog_confirmation_delete_snapshot");	
     
     //populate dropdown
     $.ajax({
@@ -123,7 +124,8 @@ var snapshotActionMap = {
     "Delete Snapshot": {              
         api: "deleteSnapshot",     
         isAsyncJob: true,
-        asyncJobResponse: "deletesnapshotresponse",        
+        asyncJobResponse: "deletesnapshotresponse",    
+		dialogBeforeActionFn : doSnapshotDelete,
         inProcessText: "Deleting snapshot....",
         afterActionSeccessFn: function(json, $midmenuItem1, id){            
             $midmenuItem1.remove();
@@ -140,6 +142,22 @@ var snapshotActionMap = {
         afterActionSeccessFn: function(json, $midmenuItem1, id){}
     }
 }   
+
+function doSnapshotDelete($actionLink, $thisTab, $midmenuItem1) {
+	$("#dialog_confirmation_delete_snapshot")	
+    .dialog('option', 'buttons', { 						
+	    "Confirm": function() { 
+		    $(this).dialog("close"); 	
+			var id = $thisTab.data("jsonObj").id;
+			var apiCommand = "command=deleteSnapshot&id="+id;                      
+            doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab); 
+	    }, 
+	    "Cancel": function() { 
+		    $(this).dialog("close"); 
+			
+	    } 
+    }).dialog("open");
+}
 
 function doCreateVolumeFromSnapshotInSnapshotPage($actionLink, $detailsTab, $midmenuItem1){ 
     var jsonObj = $detailsTab.data("jsonObj");
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index 27b4aa6a5ee..eda95a42c55 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -23,7 +23,8 @@ function afterLoadVolumeJSP() {
     initDialog("dialog_add_volume");	
     initDialog("dialog_attach_volume");	
     initDialog("dialog_add_volume_from_snapshot");	
-    initDialog("dialog_create_template_from_snapshot", 400);    
+    initDialog("dialog_create_template_from_snapshot", 400);    
+	initDialog("dialog_confirmation_delete_snapshot");
 	        
     $.ajax({
         data: createURL("command=listOsTypes"),
@@ -888,7 +889,8 @@ var volumeSnapshotActionMap = {
     "Delete Snapshot": {              
         api: "deleteSnapshot",     
         isAsyncJob: true,
-        asyncJobResponse: "deletesnapshotresponse",        
+        asyncJobResponse: "deletesnapshotresponse",
+		dialogBeforeActionFn : doSnapshotDelete,
         inProcessText: "Deleting snapshot....",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
@@ -904,7 +906,23 @@ var volumeSnapshotActionMap = {
         inProcessText: "Creating Template....",
         afterActionSeccessFn: function(json, id, $subgridItem) {}            
     }
-}  
+}  
+
+function doSnapshotDelete($actionLink, $subgridItem) {
+	$("#dialog_confirmation_delete_snapshot")	
+    .dialog('option', 'buttons', { 						
+	    "Confirm": function() { 
+		    $(this).dialog("close"); 	
+			var id = $subgridItem.data("jsonObj").id;
+			var apiCommand = "command=deleteSnapshot&id="+id;                      
+            doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem); 
+	    }, 
+	    "Cancel": function() { 
+		    $(this).dialog("close"); 
+			
+	    } 
+    }).dialog("open");
+}
                                               
 function doCreateVolumeFromSnapshotInVolumePage($actionLink, $subgridItem) { 
     var jsonObj = $subgridItem.data("jsonObj");