diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py
index 53b425b75..dc9cca650 100644
--- a/src/Mod/Arch/ArchAxis.py
+++ b/src/Mod/Arch/ArchAxis.py
@@ -340,10 +340,9 @@ class _AxisTaskPanel:
         self.obj.Angles = a
         FreeCAD.ActiveDocument.recompute()
     
-    def finish(self):
+    def accept(self):
         self.resetObject()
-        if self.obj:
-            self.obj.ViewObject.finishEditing()
+        FreeCADGui.ActiveDocument.resetEdit()
                     
     def retranslateUi(self, TaskPanel):
         TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Axes", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index 6b8b33af1..b6065fa04 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -222,8 +222,7 @@ class ComponentTaskPanel:
 
     def accept(self):
         FreeCAD.ActiveDocument.recompute()
-        if self.obj:
-            self.obj.ViewObject.finishEditing()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
 
     def editObject(self,wid,col):
@@ -308,7 +307,7 @@ class ViewProviderComponent:
     
     def unsetEdit(self,vobj,mode):
         FreeCADGui.Control.closeDialog()
-        return
+        return False
 
 class ArchSelectionObserver:
     def __init__(self,origin,watched):
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 831220e51..9d942fe14 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -147,12 +147,10 @@ class DraftTaskPanel:
     def getStandardButtons(self):
         return int(QtGui.QDialogButtonBox.Cancel)
     def accept(self):
-        if FreeCAD.activeDraftCommand:
-            FreeCAD.activeDraftCommand.finish()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
     def reject(self):
-        if FreeCAD.activeDraftCommand:
-            FreeCAD.activeDraftCommand.finish()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
   
 class DraftToolBar: