diff --git a/src/Mod/Path/PathScripts/PathAdaptive.py b/src/Mod/Path/PathScripts/PathAdaptive.py
index f55e9ef1ea..e171813f80 100644
--- a/src/Mod/Path/PathScripts/PathAdaptive.py
+++ b/src/Mod/Path/PathScripts/PathAdaptive.py
@@ -212,6 +212,12 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter):
                     else:
                         # Cone
                         _HelixAngle = 360 - (float(obj.HelixAngle) * 4)
+
+                        if obj.HelixConeAngle > 6:
+                            obj.HelixConeAngle = 6
+                        
+                        helixRadius *= 0.9
+
                         # Calculate everything
                         helix_height = passStartDepth - passEndDepth
                         r_extra = helix_height * math.tan(math.radians(obj.HelixConeAngle))
@@ -250,7 +256,7 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter):
                         i_off = (x_m - p['X']) / 2
                         j_off = (y_m - p['Y']) / 2
 
-                        # one more circle at target depth to make sure center is cleared
+                        # One more circle at target depth to make sure center is cleared
                         op.commandlist.append(Path.Command("G3", { "X": x_m, "Y": y_m, "Z": passEndDepth, "I": i_off, "J": j_off, "F": op.horizFeed}))
                         op.commandlist.append(Path.Command("G3", { "X": p['X'], "Y": p['Y'], "Z": passEndDepth, "I": -i_off, "J": -j_off, "F": op.horizFeed}))
 
diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/PathScripts/PathAdaptiveGui.py
index de3a49d918..0e25e92128 100644
--- a/src/Mod/Path/PathScripts/PathAdaptiveGui.py
+++ b/src/Mod/Path/PathScripts/PathAdaptiveGui.py
@@ -79,19 +79,19 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         # helix angle
         form.HelixAngle = QtGui.QDoubleSpinBox()
         form.HelixAngle.setMinimum(1)
-        form.HelixAngle.setMaximum(359)
+        form.HelixAngle.setMaximum(89)
         form.HelixAngle.setSingleStep(1)
-        form.HelixAngle.setValue(250)
+        form.HelixAngle.setValue(5)
         form.HelixAngle.setToolTip("Angle of the helix ramp entry")
         formLayout.addRow(QtGui.QLabel("Helix Ramp Angle"), form.HelixAngle)
 
         # helix cone angle
         form.HelixConeAngle = QtGui.QDoubleSpinBox()
         form.HelixConeAngle.setMinimum(0)
-        form.HelixConeAngle.setMaximum(45)
+        form.HelixConeAngle.setMaximum(6)
         form.HelixConeAngle.setSingleStep(1)
         form.HelixConeAngle.setValue(0)
-        form.HelixConeAngle.setToolTip("Angle of the helix cone")
+        form.HelixConeAngle.setToolTip("Angle of the helix entry cone")
         formLayout.addRow(QtGui.QLabel("Helix Cone Angle"), form.HelixConeAngle)
 
         # helix diam. limit