diff --git a/src/TextField/TextField.jsx b/src/TextField/TextField.jsx
index a24bb9bebcfece..c5e66844286962 100644
--- a/src/TextField/TextField.jsx
+++ b/src/TextField/TextField.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import keycode from 'keycode';
+import shallowEqual from '../utils/shallow-equal';
 import ColorManipulator from '../utils/color-manipulator';
 import Transitions from '../styles/transitions';
 import deprecated from '../utils/deprecatedPropType';
@@ -356,6 +357,14 @@ const TextField = React.createClass({
     if (newState) this.setState(newState);
   },
 
+  shouldComponentUpdate(nextProps, nextState, nextContext) {
+    return (
+      !shallowEqual(this.props, nextProps) ||
+      !shallowEqual(this.state, nextState) ||
+      !shallowEqual(this.context, nextContext)
+    );
+  },
+
   blur() {
     if (this.input) this._getInputNode().blur();
   },