diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index a788a00f7a..d9924b87dd 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -106,7 +106,7 @@ class AddDrawing(bpy.types.Operator, Operator):
 
 
 class CreateDrawing(bpy.types.Operator):
-    """Creates a svg drawing
+    """Creates/refreshes a .svg drawing
 
     Only available if :
     - IFC file is created
@@ -118,13 +118,10 @@ class CreateDrawing(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        camera = context.scene.camera
-        return (
-            IfcStore.get_file()
-            and camera
-            and camera.type == "CAMERA"
-            and camera.data.type == "ORTHO"
-            and camera.BIMObjectProperties.ifc_definition_id
+        return bool(
+            tool.Ifc.get()
+            and tool.Drawing.is_camera_orthographic()
+            and tool.Drawing.is_drawing_active()
         )
 
     def execute(self, context):
@@ -686,39 +683,18 @@ class OpenView(bpy.types.Operator):
 
 
 class ActivateView(bpy.types.Operator):
+    """
+    Activates the selected drawing view
+    """
+
     bl_idname = "bim.activate_view"
     bl_label = "Activate View"
     bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Activates the selected drawing view"
     drawing: bpy.props.IntProperty()
 
     def execute(self, context):
-        camera = tool.Ifc.get_object(tool.Ifc.get().by_id(self.drawing))
-        if not camera:
-            return {"FINISHED"}
-        area = next(area for area in context.screen.areas if area.type == "VIEW_3D")
-        is_local_view = area.spaces[0].local_view is not None
-        if is_local_view:
-            bpy.ops.view3d.localview()
-            context.scene.camera = camera
-            bpy.ops.view3d.localview()
-        else:
-            context.scene.camera = camera
-        area.spaces[0].region_3d.view_perspective = "CAMERA"
-        views_collection = bpy.data.collections.get("Views")
-        for collection in views_collection.children:
-            # We assume the project collection is at the top level
-            for project_collection in context.view_layer.layer_collection.children:
-                # We assume a convention that the 'Views' collection is directly
-                # in the project collection
-                if (
-                    "Views" in project_collection.children
-                    and collection.name in project_collection.children["Views"].children
-                ):
-                    project_collection.children["Views"].children[collection.name].hide_viewport = True
-                    bpy.data.collections.get(collection.name).hide_render = True
-
-                    project_collection.children["Views"].children[camera.users_collection[0].name].hide_viewport = False
-        bpy.data.collections.get(camera.users_collection[0].name).hide_render = False
+        core.activate_drawing_view(tool.Ifc, tool.Drawing, drawing=tool.Ifc.get().by_id(self.drawing))
         bpy.context.scene.DocProperties.active_drawing_id = self.drawing
         bpy.ops.bim.activate_drawing_style()
         core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=tool.Ifc.get().by_id(self.drawing))
diff --git a/src/blenderbim/blenderbim/core/drawing.py b/src/blenderbim/blenderbim/core/drawing.py
index 135ee071d1..e79fc5ac15 100644
--- a/src/blenderbim/blenderbim/core/drawing.py
+++ b/src/blenderbim/blenderbim/core/drawing.py
@@ -262,3 +262,9 @@ def sync_references(ifc, collector, drawing_tool, drawing=None):
 
 def select_assigned_product(drawing):
     drawing.select_assigned_product()
+
+def activate_drawing_view(ifc, drawing_tool, drawing):
+    camera = ifc.get_object(drawing)
+    if not camera:
+        return
+    drawing_tool.activate_view(camera)
diff --git a/src/blenderbim/blenderbim/core/tool.py b/src/blenderbim/blenderbim/core/tool.py
index 46e4cfa164..a158fb779b 100644
--- a/src/blenderbim/blenderbim/core/tool.py
+++ b/src/blenderbim/blenderbim/core/tool.py
@@ -203,6 +203,9 @@ class Drawing:
     def show_decorations(cls): pass
     def sync_object_placement(cls, obj): pass
     def update_text_value(cls, obj): pass
+    def is_drawing_active(cls): pass
+    def is_camera_orthographic(cls): pass
+    def activate_view(cls, camera): pass
 
 
 @interface
diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py
index 4141e6d286..ee410cf7e7 100644
--- a/src/blenderbim/blenderbim/tool/drawing.py
+++ b/src/blenderbim/blenderbim/tool/drawing.py
@@ -901,6 +901,7 @@ class Drawing(blenderbim.core.tool.Drawing):
         if tool.Ifc.get_schema() == "IFC2X3":
             return reference.ReferenceToDocument[0]
         return reference.ReferencedDocument
+
     @classmethod
     def select_assigned_product(cls):
         obj = cls.get_active_object()
@@ -908,3 +909,43 @@ class Drawing(blenderbim.core.tool.Drawing):
         product = cls.get_assigned_product(element)
         if product:
             tool.Ifc.get_object(product).select_set(True)
+
+    @classmethod
+    def is_drawing_active(cls):
+        camera = bpy.context.scene.camera
+        return (camera and camera.type == "CAMERA" and
+                camera.BIMObjectProperties.ifc_definition_id and
+                any(a.type == 'VIEW_3D' for a in bpy.context.screen.areas))
+
+    @classmethod
+    def is_camera_orthographic(cls):
+        camera = bpy.context.scene.camera
+        return True if (camera and camera.data.type == "ORTHO") else False
+
+    @classmethod
+    def activate_view(cls, camera):
+        area = next(area for area in bpy.context.screen.areas if area.type == "VIEW_3D")
+        is_local_view = area.spaces[0].local_view is not None
+        if is_local_view:
+            bpy.ops.view3d.localview()
+            bpy.context.scene.camera = camera
+            bpy.ops.view3d.localview()
+        else:
+            bpy.context.scene.camera = camera
+        area.spaces[0].region_3d.view_perspective = "CAMERA"
+        views_collection = bpy.data.collections.get("Views")
+        for collection in views_collection.children:
+            # We assume the project collection is at the top level
+            for project_collection in bpy.context.view_layer.layer_collection.children:
+                # We assume a convention that the 'Views' collection is directly
+                # in the project collection
+                if (
+                    "Views" in project_collection.children
+                    and collection.name in project_collection.children["Views"].children
+                ):
+                    project_collection.children["Views"].children[collection.name].hide_viewport = True
+                    bpy.data.collections.get(collection.name).hide_render = True
+
+                    project_collection.children["Views"].children[camera.users_collection[0].name].hide_viewport = False
+        bpy.data.collections.get(camera.users_collection[0].name).hide_render = False
+        tool.Spatial.set_active_object(camera)
\ No newline at end of file