diff --git a/components/Autocomplete/index.js b/components/Autocomplete/index.js
index 9cbd740..9b9f4fa 100644
--- a/components/Autocomplete/index.js
+++ b/components/Autocomplete/index.js
@@ -1,4 +1,3 @@
-import React, {Component, Fragment} from "react";
 import {findNodeHandle, ActivityIndicator, TextInput, View} from "react-native";
 import {string, bool, number, func} from "prop-types";
 import Dropdown from "../Dropdown";
@@ -134,11 +133,16 @@ class Autocomplete extends Component {
   }
 
   componentDidMount() {
-    const {data} = this.props;
+    const {data, initialValue} = this.props;
     this.mounted = true;
+
     if (data) {
       this.setState({items: data});
     }
+
+    if (initialValue){
+      this.setState({ initialValue })
+    }
   }
 
   componentWillUnmount() {
@@ -154,6 +158,20 @@ class Autocomplete extends Component {
     }
   }
 
+  componentDidUpdate(prevProps){
+    const shouldUpdateInitialValue = (
+      prevProps.initialValue !== this.props.initialValue
+    );
+
+    if (!shouldUpdateInitialValue){
+      return;
+    }
+
+    this.setState({
+      inputValue: this.props.initialValue
+    })
+  }
+
   render() {
     const {inputValue, items, loading, filteredItems} = this.state;
     const {
@@ -196,6 +214,7 @@ class Autocomplete extends Component {
                 scrollToInput(findNodeHandle(event.target));
               }
             }}
+            onSubmitEditing={this.props.onSubmitEditing}
           />
           {loading && (
             <ActivityIndicator
diff --git a/index.d.ts b/index.d.ts
index 2591e7c..f169b7f 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for react-native-dropdown-autocomplete 1.0
 
 import * as React from 'react';
-import { ViewStyle, TextStyle, StyleProp, KeyboardTypeOptions } from 'react-native';
+import { ViewStyle, TextStyle, StyleProp, KeyboardTypeOptions, TextInputProps } from 'react-native';
 
 type AutocompleteProps = {
     autoCorrect?: boolean;
@@ -35,7 +35,7 @@ type AutocompleteProps = {
     pickerStyle?: StyleProp<TextStyle>;
     containerStyle?: StyleProp<ViewStyle>;
     scrollStyle?: StyleProp<ViewStyle>;
-
+    onSubmitEditing?: TextInputProps["onSubmitEditing"];
     scrollToInput?: (ev: any) => void;
     handleSelectItem: (item: any, index: number) => void;
     onDropdownShow?: () => void;