diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index fb8b1ce5a8..a69e2a2ed0 100644
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -328,7 +328,7 @@ class BuildVolume(SceneNode):
                 self._build_volume_message.hide()
             rebuild_me = True
 
-        if setting_key in self._skirt_settings or setting_key in self._prime_settings or setting_key in self._tower_settings or setting_key == "print_sequence" or setting_key in self._ooze_shield_settings:
+        if setting_key in self._skirt_settings or setting_key in self._prime_settings or setting_key in self._tower_settings or setting_key == "print_sequence" or setting_key in self._ooze_shield_settings or setting_key in self._distance_settings:
             self._updateDisallowedAreas()
             rebuild_me = True
 
@@ -495,6 +495,7 @@ class BuildVolume(SceneNode):
                 del extruder_values[adhesion_extruder_nr]  # Remove the value of the adhesion extruder nr.
                 for value in extruder_values:
                     skirt_size += value
+
         elif adhesion_type == "brim":
             skirt_size = self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("skirt_brim_line_width", "value")
             if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:
@@ -516,6 +517,12 @@ class BuildVolume(SceneNode):
         if container_stack.getProperty("xy_offset", "value"):
             skirt_size += container_stack.getProperty("xy_offset", "value")
 
+        if container_stack.getProperty("infill_wipe_dist", "value"):
+            skirt_size += container_stack.getProperty("infill_wipe_dist", "value")
+
+        if container_stack.getProperty("travel_avoid_dist", "value"):
+            skirt_size += container_stack.getProperty("travel_avoid_dist", "value")
+
         return skirt_size
 
     def _clamp(self, value, min_value, max_value):
@@ -526,3 +533,4 @@ class BuildVolume(SceneNode):
     _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "extruder_prime_pos_z"]
     _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y"]
     _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
+    _distance_settings = ["infill_wipe_dist", "travel_avoid_dist"]