diff --git a/src/Mod/Draft/DraftEdit.py b/src/Mod/Draft/DraftEdit.py
index 9985c543c3..49ebd89997 100644
--- a/src/Mod/Draft/DraftEdit.py
+++ b/src/Mod/Draft/DraftEdit.py
@@ -883,7 +883,9 @@ class Edit():
         newPoints = []
         hasAddedPoint = False
         if hasattr(obj, "ChamferSize") and hasattr(obj, "FilletRadius"):
-            if obj.ChamferSize > 0 or obj.FilletRadius > 0:
+            if obj.ChamferSize > 0 and obj.FilletRadius > 0:
+                edgeIndex = (edgeIndex +3) / 4
+            elif obj.ChamferSize > 0 or obj.FilletRadius > 0:
                 edgeIndex = (edgeIndex +1) / 2
 
         for index, point in enumerate(self.obj.Points):
@@ -1840,4 +1842,4 @@ class Edit():
 
 if App.GuiUp:
     # setup command
-    Gui.addCommand('Draft_Edit', Edit())
\ No newline at end of file
+    Gui.addCommand('Draft_Edit', Edit())