diff --git a/src/Search/Search.js b/src/Search/Search.js
index 7085691b..a01b7d59 100644
--- a/src/Search/Search.js
+++ b/src/Search/Search.js
@@ -368,7 +368,7 @@ class Search extends Component {
             <Manager style={ManagerStyle}>
               <Downshift
                 itemToString={this.itemToString}
-                inputValue={inputValue}
+                selectedItem={this.props.inputValue || selectedItem}
                 selectedItem={selectedItem}
                 onChange={onChange}
                 onUserAction={this.handleOnUserAction}