diff --git a/src/Mod/Draft/draftviewproviders/view_facebinder.py b/src/Mod/Draft/draftviewproviders/view_facebinder.py
index 29261cb9cc..ca75d9d7f4 100644
--- a/src/Mod/Draft/draftviewproviders/view_facebinder.py
+++ b/src/Mod/Draft/draftviewproviders/view_facebinder.py
@@ -29,11 +29,8 @@
 # @{
 import FreeCADGui as Gui
 
-import DraftGui
-
 from draftviewproviders.view_base import ViewProviderDraft
 
-
 class ViewProviderFacebinder(ViewProviderDraft):
     def __init__(self,vobj):
         super(ViewProviderFacebinder, self).__init__(vobj)
@@ -42,6 +39,10 @@ class ViewProviderFacebinder(ViewProviderDraft):
         return ":/icons/Draft_Facebinder_Provider.svg"
 
     def setEdit(self,vobj,mode):
+        if mode != 0:
+            return None
+
+        import DraftGui # Moving this to the top of the file results in a circular import.
         taskd = DraftGui.FacebinderTaskPanel()
         taskd.obj = vobj.Object
         taskd.update()
@@ -49,8 +50,11 @@ class ViewProviderFacebinder(ViewProviderDraft):
         return True
 
     def unsetEdit(self,vobj,mode):
+        if mode != 0:
+            return None
+
         Gui.Control.closeDialog()
-        return False
+        return True
 
 
 # Alias for compatibility with v0.18 and earlier
diff --git a/src/Mod/Draft/draftviewproviders/view_hatch.py b/src/Mod/Draft/draftviewproviders/view_hatch.py
index aa002cea04..5fc274966b 100644
--- a/src/Mod/Draft/draftviewproviders/view_hatch.py
+++ b/src/Mod/Draft/draftviewproviders/view_hatch.py
@@ -23,8 +23,6 @@
 
 """This module contains FreeCAD commands for the Draft workbench"""
 
-import os
-import FreeCAD
 from draftguitools.gui_hatch import Draft_Hatch_TaskPanel
 
 class ViewProviderDraftHatch:
@@ -47,6 +45,8 @@ class ViewProviderDraftHatch:
         return None
 
     def setEdit(self,vobj,mode):
+        if mode != 0:
+            return None
 
         import FreeCADGui
 
@@ -59,12 +59,10 @@ class ViewProviderDraftHatch:
         return True
 
     def unsetEdit(self,vobj,mode):
+        if mode != 0:
+            return None
 
         import FreeCADGui
 
         FreeCADGui.Control.closeDialog()
         return True
-
-    def doubleClicked(self,vobj):
-
-        self.setEdit(vobj,None)
diff --git a/src/Mod/Draft/draftviewproviders/view_shapestring.py b/src/Mod/Draft/draftviewproviders/view_shapestring.py
index 7c104b27a5..48e2ca7513 100644
--- a/src/Mod/Draft/draftviewproviders/view_shapestring.py
+++ b/src/Mod/Draft/draftviewproviders/view_shapestring.py
@@ -39,6 +39,8 @@ class ViewProviderShapeString(ViewProviderDraft):
         return ":/icons/Draft_ShapeString.svg"
 
     def setEdit(self, vobj, mode):
+        if mode != 0:
+            return None
 
         self.wb_before_edit = Gui.activeWorkbench()
         Gui.activateWorkbench("DraftWorkbench")
@@ -47,7 +49,9 @@ class ViewProviderShapeString(ViewProviderDraft):
 
         return True
 
-    def unsetEdit(self,vobj,mode):
+    def unsetEdit(self, vobj, mode):
+        if mode != 0:
+            return None
 
         self.task.finish()
         Gui.activateWorkbench(self.wb_before_edit.name())