diff --git a/src/time-picker/time-picker.jsx b/src/time-picker/time-picker.jsx
index f4e0557d3fa798..5f155a715aa3ba 100644
--- a/src/time-picker/time-picker.jsx
+++ b/src/time-picker/time-picker.jsx
@@ -108,6 +108,17 @@ const TimePicker = React.createClass({
       muiTheme: this.context.muiTheme || getMuiTheme(),
     };
   },
+  
+  componentWillReceiveProps(nextProps, nextContext) {
+    const newState = this.state;
+    if (nextContext.muiTheme) {
+      newState.muiTheme = nextContext.muiTheme; 
+    }
+    if (!Date.isEqualTime(this.state.time, nextProps.defaultTime)) {
+      newState.time = nextProps.defaultTime;
+    }
+    this.setState(newState);
+  },
 
   windowListeners: {
     'keyup': '_handleWindowKeyUp',