diff --git a/.changeset/perfect-cars-jam.md b/.changeset/perfect-cars-jam.md
index a22791034a..45166ac823 100644
--- a/.changeset/perfect-cars-jam.md
+++ b/.changeset/perfect-cars-jam.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder': minor
 ---
 
-Changed the way to display entities in `MyGroupsPicker` to use entityPresentationApi and make it consistent across scaffolder pickers
+Changed the way to display entities in `MyGroupsPicker` to use `entityPresentationApi` and make it consistent across scaffolder pickers
diff --git a/plugins/scaffolder/src/components/fields/VirtualizedListbox.tsx b/plugins/scaffolder/src/components/fields/VirtualizedListbox.tsx
index b2bd611cec..2fad510918 100644
--- a/plugins/scaffolder/src/components/fields/VirtualizedListbox.tsx
+++ b/plugins/scaffolder/src/components/fields/VirtualizedListbox.tsx
@@ -22,6 +22,7 @@ const renderRow = (props: ListChildComponentProps) => {
   return React.cloneElement(data[index], { style });
 };
 
+// Context needed to keep Autocomplete working correctly : https://v4.mui.com/components/autocomplete/#virtualization
 const OuterElementContext = React.createContext({});
 
 const OuterElementType = React.forwardRef<HTMLDivElement>((props, ref) => {