diff --git a/src/date-picker/calendar.jsx b/src/date-picker/calendar.jsx
index 665f99ee01e413..915e294a5ca82c 100644
--- a/src/date-picker/calendar.jsx
+++ b/src/date-picker/calendar.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import WindowListenable from '../mixins/window-listenable';
+import EventListener from 'react-event-listener';
 import DateTime from '../utils/date-time';
 import KeyCode from '../utils/key-code';
 import Transitions from '../styles/transitions';
@@ -37,10 +37,6 @@ const Calendar = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    WindowListenable,
-  ],
-
   getDefaultProps() {
     return {
       disableYearSelection: false,
@@ -81,10 +77,6 @@ const Calendar = React.createClass({
     this.setState({muiTheme});
   },
 
-  windowListeners: {
-    keydown: '_handleWindowKeyDown',
-  },
-
   _yearSelector() {
     if (this.props.disableYearSelection) return;
 
@@ -303,6 +295,10 @@ const Calendar = React.createClass({
 
     return (
       <ClearFix style={styles.root}>
+        <EventListener
+          elementName="window"
+          onKeyDown={this._handleWindowKeyDown}
+        />
         <DateDisplay
           DateTimeFormat={DateTimeFormat}
           locale={locale}
diff --git a/src/date-picker/date-picker-dialog.jsx b/src/date-picker/date-picker-dialog.jsx
index 922b119f493844..5eedecee036b3a 100644
--- a/src/date-picker/date-picker-dialog.jsx
+++ b/src/date-picker/date-picker-dialog.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import ContextPure from '../mixins/context-pure';
-import WindowListenable from '../mixins/window-listenable';
+import EventListener from 'react-event-listener';
 import KeyCode from '../utils/key-code';
 import Calendar from './calendar';
 import Dialog from '../dialog';
@@ -43,7 +43,6 @@ const DatePickerDialog = React.createClass({
   },
 
   mixins: [
-    WindowListenable,
     ContextPure,
   ],
 
@@ -92,10 +91,6 @@ const DatePickerDialog = React.createClass({
     });
   },
 
-  windowListeners: {
-    keyup: '_handleWindowKeyUp',
-  },
-
   show() {
     if (this.props.onShow && !this.state.open) this.props.onShow();
     this.setState({
@@ -211,6 +206,10 @@ const DatePickerDialog = React.createClass({
         open={this.state.open}
         onRequestClose={this.dismiss}
       >
+        <EventListener
+          elementName="window"
+          onKeyUp={this._handleWindowKeyUp}
+        />
         <Calendar
           DateTimeFormat={DateTimeFormat}
           firstDayOfWeek={firstDayOfWeek}
diff --git a/src/date-picker/date-picker.jsx b/src/date-picker/date-picker.jsx
index bc6d2c42d4af14..59220c9da94c2c 100644
--- a/src/date-picker/date-picker.jsx
+++ b/src/date-picker/date-picker.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import WindowListenable from '../mixins/window-listenable';
 import DateTime from '../utils/date-time';
 import DatePickerDialog from './date-picker-dialog';
 import TextField from '../text-field';
@@ -148,10 +147,6 @@ const DatePicker = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    WindowListenable,
-  ],
-
   getDefaultProps() {
     return {
       formatDate: DateTime.format,
@@ -192,10 +187,6 @@ const DatePicker = React.createClass({
     }
   },
 
-  windowListeners: {
-    keyup: '_handleWindowKeyUp',
-  },
-
   getDate() {
     return this.state.date;
   },
@@ -240,10 +231,6 @@ const DatePicker = React.createClass({
       }, 0);
   },
 
-  _handleWindowKeyUp() {
-    //TO DO: open the dialog if input has focus
-  },
-
   _isControlled() {
     return this.props.hasOwnProperty('value') ||
       this.props.hasOwnProperty('valueLink');