diff --git a/CHANGELOG.md b/CHANGELOG.md
index 727aea175..1c2a7689f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Remove unnecessary `aria-rowindex` in `ItemView` and `ItemEdit` components. Fixes STSMACOM-871.
 * Check for `active` status of `<Settings>` navigation links independently from the applied href and query string. Query string should only be applied to active link. Refs STSMACOM-837.
 * `<EditableListForm>` use `lodash.isEmpty` to check for empty `state.status` in re-initialization checks on component update. Fixes STSMACOM-876.
+* `<NoteFields>` improve "Display as pop-up" markup and fix label a11y issue. Refs STSMACOM-882.
 
 ## [9.2.3] IN PROGRESS
 
diff --git a/lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js b/lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js
index 8b537c295..d28bd26bc 100644
--- a/lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js
+++ b/lib/Notes/components/NoteForm/components/NoteFields/NoteFields.js
@@ -90,39 +90,29 @@ export default class NoteFields extends Component {
         {showDisplayAsPopupOptions && (
           <Row>
             <Col xs={12}>
-              <Row>
-                <Col xs={12}>
-                  <Label tagName="div">
-                    <span className={styles.heading}>
-                      <FormattedMessage id="stripes-smart-components.notes.displayAsPopup.label" />
-                    </span>
-                  </Label>
-                </Col>
-              </Row>
-              <Row>
-                <Col xs={12}>
-                  <Field
-                    name="popUpOnCheckOut"
-                    type="checkbox"
-                    component={Checkbox}
-                    data-test-note-popup-on-checkout-field
-                    label={<FormattedMessage id="stripes-smart-components.notes.displayAsPopup.checkout" />}
-                    readOnly={fieldsAreDisabled}
-                  />
-                </Col>
-              </Row>
-              <Row>
-                <Col xs={12}>
-                  <Field
-                    name="popUpOnUser"
-                    type="checkbox"
-                    component={Checkbox}
-                    data-test-note-popup-on-users-field
-                    label={<FormattedMessage id="stripes-smart-components.notes.displayAsPopup.users" />}
-                    readOnly={fieldsAreDisabled}
-                  />
-                </Col>
-              </Row>
+              <Label id="display-as-popup-group-label">
+                <span className={styles.heading}>
+                  <FormattedMessage id="stripes-smart-components.notes.displayAsPopup.label" />
+                </span>
+              </Label>
+              <fieldset aria-labelledby="display-as-popup-group-label">
+                <Field
+                  name="popUpOnCheckOut"
+                  type="checkbox"
+                  component={Checkbox}
+                  data-test-note-popup-on-checkout-field
+                  label={<FormattedMessage id="stripes-smart-components.notes.displayAsPopup.checkout" />}
+                  readOnly={fieldsAreDisabled}
+                />
+                <Field
+                  name="popUpOnUser"
+                  type="checkbox"
+                  component={Checkbox}
+                  data-test-note-popup-on-users-field
+                  label={<FormattedMessage id="stripes-smart-components.notes.displayAsPopup.users" />}
+                  readOnly={fieldsAreDisabled}
+                />
+              </fieldset>
             </Col>
           </Row>
         )}