diff --git a/javascript/DateField.js b/javascript/DateField.js
index d12d32ce7..deeed7feb 100644
--- a/javascript/DateField.js
+++ b/javascript/DateField.js
@@ -26,7 +26,7 @@
 		}
 	});
 
-	$(document).on("click", "input.text.date", function() {
+	$(document).on("click", ".field.date input.text,input.text.date", function() {
 		$(this).ssDatepicker();
 
 		if($(this).data('datepicker')) {