diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
index ea17ba07738..9b881779f24 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
@@ -14,7 +14,6 @@ exports[`ClipboardCopy should match snapshot (auto-generated) 1`] = `
         class="pf-v5-c-form-control"
       >
         <input
-          aria-expanded="false"
           aria-invalid="false"
           aria-label="'Copyable input'"
           data-ouia-component-id="OUIA-Generated-TextInputBase-1"
diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
index 2303f546f8d..ca761a7a7ef 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
+++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`With popover opened 1`] = `
             class="pf-v5-c-form-control"
           >
             <input
-              aria-expanded="false"
               aria-invalid="false"
               aria-label="Date picker"
               data-ouia-component-id="OUIA-Generated-TextInputBase-4"
@@ -170,7 +169,6 @@ exports[`With popover opened 1`] = `
                       class="pf-v5-c-form-control"
                     >
                       <input
-                        aria-expanded="false"
                         aria-invalid="false"
                         aria-label="Select year"
                         data-ouia-component-id="OUIA-Generated-TextInputBase-5"
@@ -795,7 +793,6 @@ exports[`disabled date picker 1`] = `
             class="pf-v5-c-form-control pf-m-disabled"
           >
             <input
-              aria-expanded="false"
               aria-invalid="false"
               aria-label="disabled date picker"
               data-ouia-component-id="OUIA-Generated-TextInputBase-1"
diff --git a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
index b7caea5c75a..ce14fa674b2 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
+++ b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUpload.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`simple fileupload 1`] = `
           >
             <input
               aria-describedby="simple-text-file-browse-button"
-              aria-expanded="false"
               aria-invalid="false"
               aria-label="Drag a file here or browse to upload"
               data-ouia-component-id="OUIA-Generated-TextInputBase-1"
diff --git a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
index 3c1c077db36..587e4c18e29 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
+++ b/packages/react-core/src/components/FileUpload/__tests__/__snapshots__/FileUploadField.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`simple fileuploadfield 1`] = `
           >
             <input
               aria-describedby="custom-file-upload-browse-button"
-              aria-expanded="false"
               aria-invalid="false"
               aria-label="Do something custom with this!"
               data-ouia-component-id="OUIA-Generated-TextInputBase-1"
diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
index 5407d818b3c..1711ad996b9 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
+++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
@@ -37,7 +37,6 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             data-ouia-component-id="OUIA-Generated-TextInputBase-9"
             data-ouia-component-type="PF5/TextInput"
@@ -82,7 +81,6 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             data-ouia-component-id="OUIA-Generated-TextInputBase-10"
             data-ouia-component-type="PF5/TextInput"
@@ -186,7 +184,6 @@ exports[`LoginForm LoginForm with show password 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             data-ouia-component-id="OUIA-Generated-TextInputBase-11"
             data-ouia-component-type="PF5/TextInput"
@@ -237,7 +234,6 @@ exports[`LoginForm LoginForm with show password 1`] = `
               class="pf-v5-c-form-control"
             >
               <input
-                aria-expanded="false"
                 aria-invalid="false"
                 data-ouia-component-id="OUIA-Generated-TextInputBase-12"
                 data-ouia-component-type="PF5/TextInput"
@@ -343,7 +339,6 @@ exports[`LoginForm should render Login form 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             data-ouia-component-id="OUIA-Generated-TextInputBase-1"
             data-ouia-component-type="PF5/TextInput"
@@ -388,7 +383,6 @@ exports[`LoginForm should render Login form 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             data-ouia-component-id="OUIA-Generated-TextInputBase-2"
             data-ouia-component-type="PF5/TextInput"
diff --git a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
index 84e24420c53..658ef6e1895 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
+++ b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
@@ -47,7 +47,6 @@ exports[`numberInput disables lower threshold 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-7"
@@ -141,7 +140,6 @@ exports[`numberInput disables upper threshold 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-8"
@@ -237,7 +235,6 @@ exports[`numberInput passes button props successfully 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-13"
@@ -332,7 +329,6 @@ exports[`numberInput passes input props successfully 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-12"
@@ -427,7 +423,6 @@ exports[`numberInput renders custom width 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-11"
@@ -522,7 +517,6 @@ exports[`numberInput renders defaults & extra props 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-1"
@@ -617,7 +611,6 @@ exports[`numberInput renders disabled 1`] = `
           class="pf-v5-c-form-control pf-m-readonly pf-m-disabled"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-6"
@@ -713,7 +706,6 @@ exports[`numberInput renders error validated 1`] = `
           class="pf-v5-c-form-control pf-m-readonly pf-m-error"
         >
           <input
-            aria-expanded="false"
             aria-invalid="true"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-3"
@@ -828,7 +820,6 @@ exports[`numberInput renders success validated 1`] = `
           class="pf-v5-c-form-control pf-m-readonly pf-m-success"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -948,7 +939,6 @@ exports[`numberInput renders unit & position 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-10"
@@ -1042,7 +1032,6 @@ exports[`numberInput renders unit 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-9"
@@ -1141,7 +1130,6 @@ exports[`numberInput renders value 1`] = `
           class="pf-v5-c-form-control pf-m-readonly"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-5"
@@ -1235,7 +1223,6 @@ exports[`numberInput renders warning validated 1`] = `
           class="pf-v5-c-form-control pf-m-readonly pf-m-warning"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Input"
             data-ouia-component-id="OUIA-Generated-TextInputBase-4"
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
index cf0ca1adffd..93e9b6fc138 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/Navigation.test.tsx.snap
@@ -75,7 +75,6 @@ exports[`Navigation should match snapshot (auto-generated) 1`] = `
         class="pf-v5-c-form-control"
       >
         <input
-          aria-expanded="false"
           aria-invalid="false"
           aria-label="Current page"
           data-ouia-component-id="OUIA-Generated-TextInputBase-1"
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
index 0072f03798a..242c3a314d0 100644
--- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
@@ -134,7 +134,6 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-45"
@@ -343,7 +342,6 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-43"
@@ -552,7 +550,6 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-42"
@@ -761,7 +758,6 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-40"
@@ -970,7 +966,6 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-41"
@@ -1179,7 +1174,6 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-44"
@@ -1374,7 +1368,6 @@ exports[`Pagination component render custom pagination toggle 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-13"
@@ -1587,7 +1580,6 @@ exports[`Pagination component render custom perPageOptions 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-9"
@@ -1798,7 +1790,6 @@ exports[`Pagination component render custom start end 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-11"
@@ -1968,7 +1959,6 @@ exports[`Pagination component render empty per page options 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-10"
@@ -2179,7 +2169,6 @@ exports[`Pagination component render last page 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-8"
@@ -2394,7 +2383,6 @@ exports[`Pagination component render limited number of pages 1`] = `
           class="pf-v5-c-form-control pf-m-disabled"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-6"
@@ -2598,7 +2586,6 @@ exports[`Pagination component render should render correctly bottom 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -2799,7 +2786,6 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-4"
@@ -3144,7 +3130,6 @@ exports[`Pagination component render should render correctly disabled 1`] = `
           class="pf-v5-c-form-control pf-m-disabled"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-5"
@@ -3360,7 +3345,6 @@ exports[`Pagination component render should render correctly sticky 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-3"
@@ -3573,7 +3557,6 @@ exports[`Pagination component render should render correctly top 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-1"
@@ -3786,7 +3769,6 @@ exports[`Pagination component render titles 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-12"
@@ -3999,7 +3981,6 @@ exports[`Pagination component render up drop direction 1`] = `
           class="pf-v5-c-form-control"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-14"
@@ -4212,7 +4193,6 @@ exports[`Pagination component render zero results 1`] = `
           class="pf-v5-c-form-control pf-m-disabled"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label="Current page"
             data-ouia-component-id="OUIA-Generated-TextInputBase-7"
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index cabe35b9d6c..24719463b95 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -333,7 +333,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     class="pf-v5-c-form-control"
                   >
                     <input
-                      aria-expanded="false"
                       aria-invalid="false"
                       data-ouia-component-id="OUIA-Generated-TextInputBase-1"
                       data-ouia-component-type="PF5/TextInput"
@@ -370,7 +369,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     class="pf-v5-c-form-control"
                   >
                     <input
-                      aria-expanded="false"
                       aria-invalid="false"
                       data-ouia-component-id="OUIA-Generated-TextInputBase-2"
                       data-ouia-component-type="PF5/TextInput"
@@ -407,7 +405,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                     class="pf-v5-c-form-control"
                   >
                     <input
-                      aria-expanded="false"
                       aria-invalid="false"
                       data-ouia-component-id="OUIA-Generated-TextInputBase-3"
                       data-ouia-component-type="PF5/TextInput"
diff --git a/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap b/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
index 444da4f0c48..23fdc8e4ba3 100644
--- a/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
+++ b/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
@@ -60,7 +60,6 @@ exports[`slider renders continuous slider 1`] = `
         class="pf-v5-c-form-control"
       >
         <input
-          aria-expanded="false"
           aria-invalid="false"
           aria-label="Slider value input"
           data-ouia-component-id="OUIA-Generated-TextInputBase-1"
@@ -255,7 +254,6 @@ exports[`slider renders discrete slider 1`] = `
         class="pf-v5-c-form-control"
       >
         <input
-          aria-expanded="false"
           aria-invalid="false"
           aria-label="Slider value input"
           data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -428,7 +426,6 @@ exports[`slider renders slider with input 1`] = `
             class="pf-v5-c-form-control"
           >
             <input
-              aria-expanded="false"
               aria-invalid="false"
               aria-label="Slider value input"
               data-ouia-component-id="OUIA-Generated-TextInputBase-3"
@@ -519,7 +516,6 @@ exports[`slider renders slider with input above thumb 1`] = `
               class="pf-v5-c-form-control"
             >
               <input
-                aria-expanded="false"
                 aria-invalid="false"
                 aria-label="Slider value input"
                 data-ouia-component-id="OUIA-Generated-TextInputBase-4"
diff --git a/packages/react-core/src/components/TextInput/TextInput.tsx b/packages/react-core/src/components/TextInput/TextInput.tsx
index 7aea8260d95..9628f193391 100644
--- a/packages/react-core/src/components/TextInput/TextInput.tsx
+++ b/packages/react-core/src/components/TextInput/TextInput.tsx
@@ -26,6 +26,11 @@ export enum TextInputReadOnlyVariant {
   plain = 'plain'
 }
 
+interface TextinputExpandedObj {
+  isExpanded: boolean;
+  ariaControls: string;
+}
+
 export interface TextInputProps
   extends Omit<React.HTMLProps<HTMLInputElement>, 'onChange' | 'onFocus' | 'onBlur' | 'disabled' | 'ref'>,
     OUIAProps {
@@ -33,8 +38,10 @@ export interface TextInputProps
   className?: string;
   /** Flag to show if the text input is disabled. */
   isDisabled?: boolean;
-  /** Flag to apply expanded styling */
+  /** @deprecated Flag to apply expanded styling */
   isExpanded?: boolean;
+  /** Prop to apply expanded styling to the text input and link it toe the element it is controlling. This should be used when the input controls a menu and tha menu is expanded. */
+  expandedProps?: TextinputExpandedObj;
   /** Sets the input as readonly and determines the readonly styling. */
   readOnlyVariant?: 'plain' | 'default';
   /** Flag indicating whether the input is required */
@@ -182,6 +189,7 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
       isLeftTruncated,
       isStartTruncated,
       isExpanded,
+      expandedProps,
       readOnly,
       readOnlyVariant,
       isRequired,
@@ -193,6 +201,9 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
     } = this.props;
 
     const hasStatusIcon = ['success', 'error', 'warning'].includes(validated);
+    const ariaExpandedProps = expandedProps?.isExpanded
+      ? { 'aria-expanded': expandedProps?.isExpanded, 'aria-controls': expandedProps?.ariaControls, role: 'combobox' }
+      : {};
 
     return (
       <span
@@ -201,7 +212,7 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
           readOnlyVariant && styles.modifiers.readonly,
           readOnlyVariant === 'plain' && styles.modifiers.plain,
           isDisabled && styles.modifiers.disabled,
-          isExpanded && styles.modifiers.expanded,
+          (isExpanded || expandedProps?.isExpanded) && styles.modifiers.expanded,
           customIcon && styles.modifiers.icon,
           hasStatusIcon && styles.modifiers[validated as 'success' | 'warning' | 'error'],
           className
@@ -215,7 +226,7 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
           type={type}
           value={this.sanitizeInputValue(value)}
           aria-invalid={props['aria-invalid'] ? props['aria-invalid'] : validated === ValidatedOptions.error}
-          aria-expanded={isExpanded}
+          {...(expandedProps?.isExpanded && { ...ariaExpandedProps })}
           required={isRequired}
           disabled={isDisabled}
           readOnly={!!readOnlyVariant || readOnly}
diff --git a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
index 32e758e1843..99a76fc6be5 100644
--- a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
+++ b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
@@ -125,10 +125,12 @@ describe('TextInput', () => {
     expect(trimLeftFn).toHaveBeenCalled();
   });
 
-  test('has aria-expanded set to true when isExpanded is true', () => {
-    render(<TextInput isExpanded aria-label="isExpanded"/>);
+  test('has aria-expanded set to true when ariaProps.isExpanded is true', () => {
+    render(<TextInput expandedProps={{isExpanded: true, ariaControls: 'test'}}  aria-label="isExpanded"/>);
 
     const input = screen.getByLabelText('isExpanded');
     expect(input).toHaveAttribute('aria-expanded', 'true');
+    expect(input).toHaveAttribute('role', 'combobox');
+    expect(input).toHaveAttribute('aria-controls', 'test');
   });
 });
diff --git a/packages/react-core/src/components/TextInput/__tests__/__snapshots__/TextInput.test.tsx.snap b/packages/react-core/src/components/TextInput/__tests__/__snapshots__/TextInput.test.tsx.snap
index 317c20ca24d..18e5cc29bea 100644
--- a/packages/react-core/src/components/TextInput/__tests__/__snapshots__/TextInput.test.tsx.snap
+++ b/packages/react-core/src/components/TextInput/__tests__/__snapshots__/TextInput.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`TextInput default read only text input 1`] = `
     class="pf-v5-c-form-control pf-m-readonly"
   >
     <input
-      aria-expanded="false"
       aria-invalid="false"
       aria-label="default read only text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-5"
@@ -26,7 +25,6 @@ exports[`TextInput disabled text input 1`] = `
     class="pf-v5-c-form-control pf-m-disabled"
   >
     <input
-      aria-expanded="false"
       aria-invalid="false"
       aria-label="disabled text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-3"
@@ -46,7 +44,6 @@ exports[`TextInput invalid text input 1`] = `
     class="pf-v5-c-form-control pf-m-error"
   >
     <input
-      aria-expanded="false"
       aria-invalid="true"
       aria-label="invalid text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-7"
@@ -86,7 +83,6 @@ exports[`TextInput plain read only text input 1`] = `
     class="pf-v5-c-form-control pf-m-readonly pf-m-plain"
   >
     <input
-      aria-expanded="false"
       aria-invalid="false"
       aria-label="plain read only text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-6"
@@ -106,7 +102,6 @@ exports[`TextInput read only text input using isReadOnly 1`] = `
     class="pf-v5-c-form-control pf-m-readonly"
   >
     <input
-      aria-expanded="false"
       aria-invalid="false"
       aria-label="read only text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-4"
@@ -126,7 +121,6 @@ exports[`TextInput simple text input 1`] = `
     class="pf-v5-c-form-control"
   >
     <input
-      aria-expanded="false"
       aria-invalid="false"
       aria-label="simple text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -145,7 +139,6 @@ exports[`TextInput validated text input error 1`] = `
     class="pf-v5-c-form-control pf-m-error"
   >
     <input
-      aria-expanded="false"
       aria-invalid="true"
       aria-label="validated text input"
       data-ouia-component-id="OUIA-Generated-TextInputBase-10"
diff --git a/packages/react-core/src/deprecated/components/Select/__tests__/__snapshots__/Select.test.tsx.snap b/packages/react-core/src/deprecated/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
index a60814485f5..5f29634ec82 100644
--- a/packages/react-core/src/deprecated/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
@@ -1674,7 +1674,6 @@ exports[`typeahead multi select renders closed successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
@@ -1735,7 +1734,6 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
@@ -1972,7 +1970,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
@@ -2127,7 +2124,6 @@ exports[`typeahead select renders closed successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
@@ -2188,7 +2184,6 @@ exports[`typeahead select renders expanded successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
@@ -2307,7 +2302,6 @@ exports[`typeahead select renders selected successfully 1`] = `
           class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
         >
           <input
-            aria-expanded="false"
             aria-invalid="false"
             aria-label=""
             autocomplete="off"
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
index d3251fdbacb..622d6ed898f 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
@@ -10261,7 +10261,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 1 cell 1 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-1"
@@ -10295,7 +10294,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control pf-m-disabled"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 1 cell 2 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -10330,7 +10328,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 1 cell 3 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-3"
@@ -10364,7 +10361,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 1 cell 4 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-4"
@@ -10496,7 +10492,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 1 cell 1 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-5"
@@ -10530,7 +10525,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control pf-m-disabled"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 2 cell 2 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-6"
@@ -10565,7 +10559,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 2 cell 3 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-7"
@@ -10599,7 +10592,6 @@ exports[`Table simple Editable table 1`] = `
                 class="pf-v5-c-form-control"
               >
                 <input
-                  aria-expanded="false"
                   aria-invalid="false"
                   aria-label="Row 2 cell 4 content"
                   data-ouia-component-id="OUIA-Generated-TextInputBase-8"