diff --git a/lib/TextField.js b/lib/TextField.js
index d42523a..f83d195 100644
--- a/lib/TextField.js
+++ b/lib/TextField.js
@@ -28,9 +28,12 @@ export default class TextField extends Component {
   }
   componentWillReceiveProps(nextProps: Object){
     if(this.props.text !== nextProps.value){
-      nextProps.value.length !== 0 ?
-        this.refs.floatingLabel.floatLabel()
-        : this.refs.floatingLabel.sinkLabel();
+      if(nextProps.value.length === 0 && !this.state.isFocused) {
+        this.refs.floatingLabel.sinkLabel()
+      }
+      else {
+         this.refs.floatingLabel.floatLabel()
+      }
       this.setState({text: nextProps.value});
     }
     if(this.props.height !== nextProps.height){