diff --git a/forms/DateField.php b/forms/DateField.php
index 4df3dec24..90d66caed 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -119,6 +119,14 @@ class DateField extends TextField {
 		
 		return $html;
 	}
+	
+	function SmallFieldHolder($properties = array()){
+		$d = DateField_View_JQuery::create($this);
+		$d->onBeforeRender();
+		$html = parent::SmallFieldHolder($properties);
+		$html = $d->onAfterRender($html);
+		return $html;
+	}
 
 	function Field($properties = array()) {
 		$config = array(
diff --git a/javascript/DateField.js b/javascript/DateField.js
index bbe8e6d4e..4094689d5 100644
--- a/javascript/DateField.js
+++ b/javascript/DateField.js
@@ -26,7 +26,7 @@
 		}
 	});
 
-	$('.field.date input.text').live('click', function() {
+	$('.field.date input.text,.fieldholder-small input.text.date').live('click', function() {
 		$(this).ssDatepicker();
 		$(this).datepicker('show');
 	});