diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py
index ca0183b59c..7f9c16b8c2 100644
--- a/src/Mod/Draft/InitGui.py
+++ b/src/Mod/Draft/InitGui.py
@@ -137,6 +137,8 @@ class DraftWorkbench(FreeCADGui.Workbench):
                 FreeCADGui.addPreferencePage(":/ui/preferences-drafttexts.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
                 FreeCADGui.draftToolBar.loadedPreferences = True
 
+        FreeCADGui.getMainWindow().mainWindowClosed.connect(self.Deactivated)
+
         FreeCAD.Console.PrintLog('Loading Draft workbench, done.\n')
 
     def Activated(self):