diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index 92cc07582c..061f0bbc63 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -1704,4 +1704,4 @@ class SelectAssignedProduct(bpy.types.Operator, Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
-        core.select_assigned_product(tool.Drawing)
+        core.select_assigned_product(tool.Drawing, context)
diff --git a/src/blenderbim/blenderbim/core/drawing.py b/src/blenderbim/blenderbim/core/drawing.py
index b2c48fe7ad..d9567991dc 100644
--- a/src/blenderbim/blenderbim/core/drawing.py
+++ b/src/blenderbim/blenderbim/core/drawing.py
@@ -380,8 +380,8 @@ def sync_references(ifc, collector, drawing_tool, drawing=None):
             drawing_tool.sync_object_representation(reference_obj)
 
 
-def select_assigned_product(drawing):
-    drawing.select_assigned_product()
+def select_assigned_product(drawing, context):
+    drawing.select_assigned_product(context)
 
 
 def activate_drawing_view(ifc, drawing_tool, drawing):
diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py
index f063a6339e..a80fcf981a 100644
--- a/src/blenderbim/blenderbim/tool/drawing.py
+++ b/src/blenderbim/blenderbim/tool/drawing.py
@@ -1367,8 +1367,8 @@ class Drawing(blenderbim.core.tool.Drawing):
         return reference.ReferencedDocument
 
     @classmethod
-    def select_assigned_product(cls):
-        obj = cls.get_active_object()
+    def select_assigned_product(cls, context):
+        obj = context.active_object
         element = tool.Ifc.get_entity(obj)
         product = cls.get_assigned_product(element)
         if product: