diff --git a/src/dialog.jsx b/src/dialog.jsx
index 44298ccbbcbe11..381c71b725a127 100644
--- a/src/dialog.jsx
+++ b/src/dialog.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import WindowListenable from './mixins/window-listenable';
+import EventListener from 'react-event-listener';
 import KeyCode from './utils/key-code';
 import Transitions from './styles/transitions';
 import Overlay from './overlay';
@@ -191,8 +191,6 @@ const DialogInline = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [WindowListenable],
-
   getInitialState() {
     return {
       muiTheme: this.context.muiTheme || getMuiTheme(),
@@ -219,11 +217,6 @@ const DialogInline = React.createClass({
     this._positionDialog();
   },
 
-  windowListeners: {
-    keyup: '_handleWindowKeyUp',
-    resize: '_handleResize',
-  },
-
   _positionDialog() {
     const {
       actions,
@@ -347,6 +340,11 @@ const DialogInline = React.createClass({
 
     return (
       <div className={className} style={prepareStyles(styles.root)}>
+        <EventListener
+          elementName="window"
+          onKeyUp={this._handleWindowKeyUp}
+          onResize={this._handleResize}
+        />
         <ReactTransitionGroup
           component="div" ref="dialogWindow"
           transitionAppear={true} transitionAppearTimeout={450}