diff --git a/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/ExamSelection.tsx b/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/ExamSelection.tsx
index 252c99ac9..dc64e7540 100644
--- a/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/ExamSelection.tsx
+++ b/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/ExamSelection.tsx
@@ -119,18 +119,19 @@ export const ExamSelection = ({
           )}
         </FormControl>
         <Collapse in={enrollment.isFullExam === false}>
-          <LabeledTextField
-            id="public-enrollment-contact__partial-exam-selection--textField"
-            label={t('selectExams.heading')}
-            placeholder={t('selectExams.description')}
-            value={enrollment.partialExamSelection || ''}
-            onBlur={handlePartialExamSelectionBlur}
-            onChange={handlePartialExamSelectionChange}
-            error={hasPartialExamSelectionError}
-            helperText={translateCommon('errors.customTextField.required')}
-            disabled={editingDisabled}
-            fullWidth
-          />
+          <div className="public-enrollment-contact__grid__textfield-container">
+            <LabeledTextField
+              id="public-enrollment-contact__partial-exam-selection--textField"
+              label={t('selectExams.heading')}
+              placeholder={t('selectExams.description')}
+              value={enrollment.partialExamSelection || ''}
+              onBlur={handlePartialExamSelectionBlur}
+              onChange={handlePartialExamSelectionChange}
+              error={hasPartialExamSelectionError}
+              helperText={translateCommon('errors.customTextField.required')}
+              disabled={editingDisabled}
+            />
+          </div>
         </Collapse>
       </div>
     </>
diff --git a/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/Message.tsx b/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/Message.tsx
index ec9e70672..2c7b6a233 100644
--- a/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/Message.tsx
+++ b/frontend/packages/vkt/src/components/publicEnrollmentContact/steps/selectExam/Message.tsx
@@ -87,11 +87,11 @@ export const Message = ({
       <div className="public-enrollment-contact__grid__phone-extra-margin margin-top-sm rows gapped">
         <H2>{t('title')}</H2>
       </div>
-      <div className="public-enrollment-contact__grid__phone-extra-margin public-enrollment-contact__grid__previous-enrollment rows gapped">
+      <div className="public-enrollment-contact__grid__phone-extra-margin public-enrollment-contact__grid__textfield-container rows gapped">
         <div className="margin-top-sm grow full-max-width">
           <LabeledTextField
-            className="public-enrollment-contact__grid__previous-enrollment__textField"
-            id="public-enrollment__previous-enrollment__textField"
+            className="public-enrollment-contact__grid__textfield-container__textField"
+            id="public-enrollment__message__textField"
             label={t('textField.label')}
             placeholder={t('textField.placeholder')}
             value={enrollment.message}
diff --git a/frontend/packages/vkt/src/styles/components/publicEnrollmentContact/_public-enrollment-contact.scss b/frontend/packages/vkt/src/styles/components/publicEnrollmentContact/_public-enrollment-contact.scss
index 23aac50cd..c95e939a9 100644
--- a/frontend/packages/vkt/src/styles/components/publicEnrollmentContact/_public-enrollment-contact.scss
+++ b/frontend/packages/vkt/src/styles/components/publicEnrollmentContact/_public-enrollment-contact.scss
@@ -73,7 +73,7 @@
       }
     }
 
-    &__previous-enrollment {
+    &__textfield-container {
       width: 70%;
 
       @include phone {