diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 8924ebc4e72d..2cc61cc72a3d 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -172,7 +172,7 @@
 		}
 		submittedForm = true;
 
-		if (id) {
+		if (id || id===0) {
 			$('#public_id_{{ $entityType }}').val(id);
 		}
 
@@ -180,7 +180,9 @@
 	        sweetConfirm(function() {
 	            $('#action_{{ $entityType }}').val(action);
 	    		$('form.listForm_{{ $entityType }}').submit();
-	        });
+	        }, null, null, function(){ // CancelCallback
+			submittedForm = false;
+		});
 		} else {
 			$('#action_{{ $entityType }}').val(action);
 			$('form.listForm_{{ $entityType }}').submit();