diff --git a/src/components/CountryPicker/index.js b/src/components/CountryPicker/index.js
index 20f9a981accb..6d1435dca796 100644
--- a/src/components/CountryPicker/index.js
+++ b/src/components/CountryPicker/index.js
@@ -40,6 +40,7 @@ function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
     }, [value, allCountries]);
 
     const showPickerModal = () => {
+        setSearchValue(lodashGet(allCountries, value, ''));
         setIsPickerVisible(true);
     };
 
diff --git a/src/components/StatePicker/index.js b/src/components/StatePicker/index.js
index 7c8fbdae36bb..e9780e7a06b7 100644
--- a/src/components/StatePicker/index.js
+++ b/src/components/StatePicker/index.js
@@ -40,6 +40,7 @@ function StatePicker({value, errorText, onInputChange, forwardedRef}) {
     }, [value, allStates]);
 
     const showPickerModal = () => {
+        setSearchValue(lodashGet(allStates, `${value}.stateName`, ''));
         setIsPickerVisible(true);
     };