diff --git a/src/blenderbim/blenderbim/core/drawing.py b/src/blenderbim/blenderbim/core/drawing.py
index 582a80551b..97f48240c8 100644
--- a/src/blenderbim/blenderbim/core/drawing.py
+++ b/src/blenderbim/blenderbim/core/drawing.py
@@ -484,10 +484,10 @@ def activate_drawing_view(
         drawing_tool.import_annotations_in_group(drawing_tool.get_drawing_group(drawing))
     blender.activate_camera(camera)
     drawing_tool.isolate_camera_collection(camera)
-    try:
-        blender.set_active_object(camera)
-    except:
-        raise CameraNotAvailableError()
+    # try:
+    #     blender.set_active_object(camera)
+    # except:
+    #     raise CameraNotAvailableError()
     drawing_tool.activate_drawing(camera)
 
 
diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py
index 01d2c2c51c..0d9a12e95b 100644
--- a/src/blenderbim/blenderbim/tool/drawing.py
+++ b/src/blenderbim/blenderbim/tool/drawing.py
@@ -1752,6 +1752,8 @@ class Drawing(blenderbim.core.tool.Drawing):
 
     @classmethod
     def activate_drawing(cls, camera: bpy.types.Object) -> None:
+        selected_objects_before = bpy.context.selected_objects
+        
         # Sync viewport objects visibility with selectors from EPset_Drawing/Include and /Exclude
         drawing = tool.Ifc.get_entity(camera)
 
@@ -1839,6 +1841,9 @@ class Drawing(blenderbim.core.tool.Drawing):
 
         cls.import_camera_props(drawing, camera)
 
+        for obj in selected_objects_before:
+            obj.select_set(True)
+
     @classmethod
     def get_elements_in_camera_view(
         cls, camera: bpy.types.Object, objs: list[ifcopenshell.entity_instance]