diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js
index b61e7bca7a76..f5057e76fdfd 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.js
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js
@@ -17,7 +17,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import TextInput from '../../components/TextInput';
 import CONST from '../../CONST';
 import Text from '../../components/Text';
-import Form from '../../components/Form';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
 import reportPropTypes from '../reportPropTypes';
 import personalDetailsPropType from '../personalDetailsPropType';
@@ -27,6 +26,8 @@ import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
 import ROUTES from '../../ROUTES';
 import * as ReportUtils from '../../libs/ReportUtils';
+import InputWrapper from '../../components/Form/InputWrapper';
+import FormProvider from '../../components/Form/FormProvider';
 
 const propTypes = {
     /** All of the personal details for everyone */
@@ -135,7 +136,7 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
                     shouldShowBackButton
                     onCloseButtonPress={() => Navigation.dismissModal()}
                 />
-                <Form
+                <FormProvider
                     formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
                     onSubmit={savePrivateNote}
                     style={[styles.flexGrow1, styles.ph5]}
@@ -156,7 +157,8 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
                         onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
                         style={[styles.mb3]}
                     >
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                             inputID="privateNotes"
                             label={translate('privateNotes.composerLabel')}
@@ -182,7 +184,7 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
                             }}
                         />
                     </OfflineWithFeedback>
-                </Form>
+                </FormProvider>
             </FullPageNotFoundView>
         </ScreenWrapper>
     );