diff --git a/src/DatePicker/Calendar.js b/src/DatePicker/Calendar.js
index cad37a982810c0..fab8b41b6873bd 100644
--- a/src/DatePicker/Calendar.js
+++ b/src/DatePicker/Calendar.js
@@ -354,7 +354,7 @@ class Calendar extends Component {
                   key={this.state.displayDate.toDateString()}
                   minDate={this.props.minDate}
                   maxDate={this.props.maxDate}
-                  onDayTouchTap={this.handleTouchTapDay}
+                  onTouchTapDay={this.handleTouchTapDay}
                   ref="calendar"
                   selectedDate={this.state.selectedDate}
                   shouldDisableDate={this.props.shouldDisableDate}
@@ -367,8 +367,9 @@ class Calendar extends Component {
               {this.yearSelector()}
             </div>
           }
-          {this.props.showActionButtons &&
+          {this.props.cancelLabel && this.props.okLabel &&
             <CalendarActionButtons
+              autoOk={this.props.autoOk}
               cancelLabel={cancelLabel}
               okLabel={okLabel}
               onTouchTapCancel={onTouchTapCancel}
diff --git a/src/DatePicker/CalendarActionButtons.js b/src/DatePicker/CalendarActionButtons.js
index 1b3f9f199a0efb..92e44d40e82664 100644
--- a/src/DatePicker/CalendarActionButtons.js
+++ b/src/DatePicker/CalendarActionButtons.js
@@ -3,6 +3,7 @@ import FlatButton from '../FlatButton';
 
 class CalendarActionButton extends Component {
   static propTypes = {
+    autoOk: PropTypes.bool,
     cancelLabel: PropTypes.node,
     okLabel: PropTypes.node,
     onTouchTapCancel: PropTypes.func,
@@ -39,13 +40,15 @@ class CalendarActionButton extends Component {
           primary={true}
           style={styles.flatButtons}
         />
-        <FlatButton
-          disabled={this.refs.calendar !== undefined && this.refs.calendar.isSelectedDateDisabled()}
-          label={wordings ? wordings.ok : okLabel}
-          onTouchTap={this.props.onTouchTapOk}
-          primary={true}
-          style={styles.flatButtons}
-        />
+        {!this.props.autoOk &&
+          <FlatButton
+            disabled={this.refs.calendar !== undefined && this.refs.calendar.isSelectedDateDisabled()}
+            label={wordings ? wordings.ok : okLabel}
+            onTouchTap={this.props.onTouchTapOk}
+            primary={true}
+            style={styles.flatButtons}
+          />
+        }
       </div>
     );
   }
diff --git a/src/DatePicker/CalendarMonth.js b/src/DatePicker/CalendarMonth.js
index a1f53a9b52cd1e..fb366aea351dcf 100644
--- a/src/DatePicker/CalendarMonth.js
+++ b/src/DatePicker/CalendarMonth.js
@@ -9,7 +9,7 @@ class CalendarMonth extends Component {
     firstDayOfWeek: PropTypes.number,
     maxDate: PropTypes.object,
     minDate: PropTypes.object,
-    onDayTouchTap: PropTypes.func,
+    onTouchTapDay: PropTypes.func,
     selectedDate: PropTypes.object.isRequired,
     shouldDisableDate: PropTypes.func,
   };
@@ -19,7 +19,7 @@ class CalendarMonth extends Component {
   }
 
   handleTouchTapDay = (event, date) => {
-    if (this.props.onDayTouchTap) this.props.onDayTouchTap(event, date);
+    if (this.props.onTouchTapDay) this.props.onTouchTapDay(event, date);
   };
 
   shouldDisableDate(day) {
diff --git a/src/DatePicker/DatePicker.js b/src/DatePicker/DatePicker.js
index b8d05a54322ccd..3fd170e82ec2b8 100644
--- a/src/DatePicker/DatePicker.js
+++ b/src/DatePicker/DatePicker.js
@@ -134,12 +134,10 @@ class DatePicker extends Component {
 
   static defaultProps = {
     autoOk: false,
-    cancelLabel: 'Cancel',
     container: 'dialog',
     disabled: false,
     disableYearSelection: false,
     firstDayOfWeek: 1,
-    okLabel: 'OK',
     style: {},
   };
 
diff --git a/src/DatePicker/DatePickerDialog.js b/src/DatePicker/DatePickerDialog.js
index 05f04a1028b847..6504dfa9e214bb 100644
--- a/src/DatePicker/DatePickerDialog.js
+++ b/src/DatePicker/DatePickerDialog.js
@@ -92,7 +92,6 @@ class DatePickerDialog extends Component {
 
   render() {
     const {
-      // autoOk, FIXME: autoOk not working
       DateTimeFormat,
       cancelLabel,
       container,
@@ -144,6 +143,7 @@ class DatePickerDialog extends Component {
             onKeyUp={this.handleWindowKeyUp}
           />
           <Calendar
+            autoOk={this.props.autoOk}
             DateTimeFormat={DateTimeFormat}
             cancelLabel={cancelLabel}
             disableYearSelection={disableYearSelection}