diff --git a/docs/src/app/app.jsx b/docs/src/app/app.jsx
index aa73b97a80b33e..503b56157f2f2b 100644
--- a/docs/src/app/app.jsx
+++ b/docs/src/app/app.jsx
@@ -2,19 +2,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Router} from 'react-router';
 import AppRoutes from './app-routes.jsx';
-import injectTapEventPlugin from 'react-tap-event-plugin';
 import createHistory from 'history/lib/createHashHistory';
 
 //Helpers for debugging
 window.React = React;
 window.Perf = require('react-addons-perf');
 
-//Needed for onTouchTap
-//Can go away when react 1.0 release
-//Check this repo:
-//https://github.com/zilverline/react-tap-event-plugin
-injectTapEventPlugin();
-
 /**
  * Render the main app component. You can read more about the react-router here:
  * https://github.com/rackt/react-router/blob/master/docs/guides/overview.md
diff --git a/src/styles/getMuiTheme.js b/src/styles/getMuiTheme.js
index e32af09288e7ce..c1b4a92bc81995 100644
--- a/src/styles/getMuiTheme.js
+++ b/src/styles/getMuiTheme.js
@@ -1,4 +1,5 @@
 import merge from 'lodash.merge';
+import injectTapEventPlugin from 'react-tap-event-plugin';
 import Colors from './colors';
 import ColorManipulator from '../utils/color-manipulator';
 import autoPrefix from './auto-prefix';
@@ -12,6 +13,7 @@ import zIndex from './zIndex';
  * theme will be deeply merged with the second argument.
  */
 export default function getMuiTheme(baseTheme, muiTheme) {
+  injectTapEventPlugin();
   baseTheme = merge({}, lightBaseTheme, baseTheme);
   const {
     palette,