diff --git a/.changeset/search-feet-flash.md b/.changeset/search-feet-flash.md
new file mode 100644
index 0000000000..fb4a27975d
--- /dev/null
+++ b/.changeset/search-feet-flash.md
@@ -0,0 +1,21 @@
+---
+'@backstage/plugin-search-react': patch
+---
+
+Add the term autocomplete functionality to the search bar with a `SearchAutocomplete` component. Additionally, we provide a `SearchAutocompleteDefaultOption` to render options with an icon, a primary text and a secondary text.
+Example:
+
+```jsx
+// import { SearchAutocomplete, SearchAutocompleteDefaultOption} from '@backstage/plugin-search-react';
+<SearchAutocomplete
+  options={options}
+  getOptionLabel={option => option.title}
+  renderOption={option => (
+    <SearchAutocompleteDefaultOption
+      icon={<OptionIcon />}
+      primaryText={option.title}
+      secondaryText={option.text}
+    />
+  )}
+/>
+```
diff --git a/.changeset/search-planets-flash.md b/.changeset/search-planets-flash.md
new file mode 100644
index 0000000000..cc81b8c209
--- /dev/null
+++ b/.changeset/search-planets-flash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Add `userParentContext` prop to the `SearchContextProvider`, this added property does not create a local context and consumes the parent if it already exists.