diff --git a/src/blenderbim/blenderbim/bim/module/spatial/__init__.py b/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
index 76b5532d28..36a178196c 100644
--- a/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
@@ -60,6 +60,7 @@ def register():
 
 
 def unregister():
+    bpy.utils.unregister_tool(workspace.SpatialTool)
     del bpy.types.Scene.BIMSpatialProperties
     del bpy.types.Object.BIMObjectSpatialProperties
     del bpy.types.Scene.BIMSpatialManagerProperties
diff --git a/src/blenderbim/blenderbim/bim/module/structural/__init__.py b/src/blenderbim/blenderbim/bim/module/structural/__init__.py
index 8fde813631..8abf140f4c 100644
--- a/src/blenderbim/blenderbim/bim/module/structural/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/structural/__init__.py
@@ -100,5 +100,6 @@ def register():
 
 
 def unregister():
+    bpy.utils.unregister_tool(workspace.StructuralTool)
     del bpy.types.Scene.BIMStructuralProperties
     del bpy.types.Object.BIMStructuralProperties