diff --git a/corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html b/corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
index 8b005965297f..428ae14f743a 100644
--- a/corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+++ b/corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
@@ -46,17 +46,6 @@
                           {% endblocktrans %}">
       </span>
     </th>
-    <!-- ko if: requiredForOptions.length > 0 -->
-    <th class="col-md-1">
-      {% trans "Required for" %}
-      <span class="hq-help-template"
-            data-title="{% trans "Required for" %}"
-            data-content="{% blocktrans with entity_string=view.entity_string|lower %}
-                          Specify which {{ entity_string }} type this field is required for.
-                          {% endblocktrans %}">
-      </span>
-    </th>
-    <!-- /ko -->
     <th class="col-md-3">
       {% if request|request_has_privilege:"REGEX_FIELD_VALIDATION" or couch_user.is_superuser %}
         {% trans "Validation" %}
@@ -99,20 +88,18 @@
       <input class="form-control" type="text" data-bind="value: label, attr: { 'readonly': !isEditable() }"/>
     </td>
     <td>
-      <div class="form-check mt-2">
+      <div class="form-check mt-2 d-flex align-items-center">
         <input class="form-check-input" type="checkbox" data-bind="checked: is_required, attr: { 'disabled': !isEditable() }"/>
-      </div>
-    </td>
-    <!-- ko if: $root.requiredForOptions.length > 0 -->
-    <td>
-          <select class="form-select" data-bind="options: $root.requiredForOptions,
+        <!-- ko if: is_required() && $root.requiredForOptions.length > 0 -->
+          <select class="form-select ms-2" data-bind="options: $root.requiredForOptions,
                                                       optionsText: 'text',
                                                       optionsValue: 'value',
                                                       value: required_for,
-                                                      attr: { disabled: !isEditable() || !is_required() }">
+                                                      attr: { disabled: !isEditable() }">
           </select>
+        <!-- /ko -->
+      </div>
     </td>
-    <!-- /ko -->
     <td>
 
       {% if request|request_has_privilege:"REGEX_FIELD_VALIDATION" or couch_user.is_superuser %}