diff --git a/application/views/components/appointments_modal.php b/application/views/components/appointments_modal.php
index 55a401ad..3f00b974 100644
--- a/application/views/components/appointments_modal.php
+++ b/application/views/components/appointments_modal.php
@@ -284,6 +284,10 @@
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
+
+                                <?php component('custom_fields'); ?>
+
+                                <?php slot('after_primary_customer_custom_fields'); ?>
                             </div>
                             <div class="col-12 col-sm-6">
                                 <div class="mb-3">
@@ -346,10 +350,6 @@
 
                                 <?php slot('after_primary_customer_fields'); ?>
                             </div>
-
-                            <div class="mb-3">
-                                <?php component('custom_fields'); ?>
-                            </div>
                         </div>
                     </fieldset>
 
diff --git a/application/views/components/booking_info_step.php b/application/views/components/booking_info_step.php
index abc24339..c604b764 100644
--- a/application/views/components/booking_info_step.php
+++ b/application/views/components/booking_info_step.php
@@ -81,6 +81,10 @@
                 <?php endif; ?>
 
                 <?php slot('info_first_column'); ?>
+
+                <?php component('custom_fields'); ?>
+
+                <?php slot('after_custom_fields'); ?>
             </div>
 
             <div class="col-12 col-md-6 field-col mx-auto">
@@ -134,14 +138,8 @@
                 <?php endif; ?>
             
                 <?php slot('info_second_column'); ?>
-                
             </div>
 
-            <div class="mb-3">
-                <?php component('custom_fields'); ?>
-
-                <?php slot('after_custom_fields'); ?>
-            </div>
         </div>
     </div>