diff --git a/lib/elements/auto_fill.py b/lib/elements/auto_fill.py
index 1308b9e3e..e78943ec0 100644
--- a/lib/elements/auto_fill.py
+++ b/lib/elements/auto_fill.py
@@ -119,6 +119,28 @@ class AutoFill(Fill):
     def expand(self):
         return self.get_float_param('expand_mm', 0)
 
+    @property
+    @param('underpath',
+           _('Underpath'),
+           tooltip=_('Travel inside the shape when moving from section to section.  Underpath '
+                     'stitches avoid traveling in the direction of the row angle so that they '
+                     'are not visible.  This gives them a jagged appearance.'),
+           type='boolean',
+           default=True)
+    def underpath(self):
+        return self.get_boolean_param('underpath', True)
+
+    @property
+    @param('underlay_underpath',
+           _('Underpath'),
+           tooltip=_('Travel inside the shape when moving from section to section.  Underpath '
+                     'stitches avoid traveling in the direction of the row angle so that they '
+                     'are not visible.  This gives them a jagged appearance.'),
+           type='boolean',
+           default=False)
+    def underlay_underpath(self):
+        return self.get_boolean_param('underpath', False)
+
     def shrink_or_grow_shape(self, amount):
         if amount:
             shape = self.shape.buffer(amount)
@@ -169,7 +191,8 @@ class AutoFill(Fill):
                                           self.running_stitch_length,
                                           self.staggers,
                                           self.fill_underlay_skip_last,
-                                          starting_point))
+                                          starting_point,
+                                          underpath=self.underlay_underpath))
                 starting_point = stitches[-1]
 
             stitches.extend(auto_fill(self.fill_shape,
@@ -181,7 +204,8 @@ class AutoFill(Fill):
                                       self.staggers,
                                       self.skip_last,
                                       starting_point,
-                                      ending_point))
+                                      ending_point,
+                                      self.underpath))
         except InkstitchException, exc:
             # for one of our exceptions, just print the message
             self.fatal(_("Unable to autofill: ") + str(exc))