diff --git a/javascript/DateField.js b/javascript/DateField.js
index bbe8e6d4e..cd37db4a5 100644
--- a/javascript/DateField.js
+++ b/javascript/DateField.js
@@ -28,6 +28,9 @@
 
 	$('.field.date input.text').live('click', function() {
 		$(this).ssDatepicker();
-		$(this).datepicker('show');
+
+		if($(this).data('datepicker')) {
+			$(this).datepicker('show');
+		}
 	});
 }(jQuery));
\ No newline at end of file