diff --git a/src/bcf/bcf/bcfxml.py b/src/bcf/bcf/bcfxml.py
index c1291283f7..e570dc0684 100644
--- a/src/bcf/bcf/bcfxml.py
+++ b/src/bcf/bcf/bcfxml.py
@@ -9,6 +9,7 @@ from datetime import datetime
 from xml.dom import minidom
 from xmlschema import XMLSchema
 from contextlib import contextmanager
+from shutil import copyfile
 
 
 cwd = os.path.dirname(os.path.realpath(__file__))
@@ -476,7 +477,10 @@ class BcfXml:
             topic_filepath = os.path.join(self.filepath, topic.guid)
             filepath = os.path.join(topic_filepath, viewpoint.snapshot)
             if not os.path.exists(filepath):
-                pass  # TODO: handle uploading files
+                filename = viewpoint.guid + "." + viewpoint.snapshot[-3:]
+                copyfile(viewpoint.snapshot, os.path.join(topic_filepath, filename))
+                viewpoint.snapshot = filename
+        topic.viewpoints[viewpoint.guid] = viewpoint
         self.edit_topic(topic)
 
     def delete_viewpoint(self, guid, topic):
diff --git a/src/ifcblenderexport/blenderbim/bim/__init__.py b/src/ifcblenderexport/blenderbim/bim/__init__.py
index 5ca15263a8..d31ed30e45 100644
--- a/src/ifcblenderexport/blenderbim/bim/__init__.py
+++ b/src/ifcblenderexport/blenderbim/bim/__init__.py
@@ -36,11 +36,12 @@ if bpy is not None:
         operator.SaveBcfProject,
         operator.AddBcfTopic,
         operator.ViewBcfTopic,
-        operator.RemoveBcfViewpoint,
         operator.RemoveBcfComment,
         operator.EditBcfComment,
         operator.AddBcfComment,
         operator.ActivateBcfViewpoint,
+        operator.AddBcfViewpoint,
+        operator.RemoveBcfViewpoint,
         operator.OpenUri,
         operator.OpenBcfReferenceLink,
         operator.SelectFeaturesDir,
diff --git a/src/ifcblenderexport/blenderbim/bim/operator.py b/src/ifcblenderexport/blenderbim/bim/operator.py
index 60efc7ccc2..f58c9b2e58 100644
--- a/src/ifcblenderexport/blenderbim/bim/operator.py
+++ b/src/ifcblenderexport/blenderbim/bim/operator.py
@@ -28,7 +28,7 @@ from . import helper
 from bpy_extras.io_utils import ImportHelper
 from itertools import cycle
 from mathutils import Vector, Matrix, Euler, geometry
-from math import radians, atan, tan, cos, sin
+from math import radians, degrees, atan, tan, cos, sin
 from pathlib import Path
 from bpy.app.handlers import persistent
 
@@ -741,6 +741,53 @@ class ViewBcfTopic(bpy.types.Operator):
         return {"FINISHED"}
 
 
+class AddBcfViewpoint(bpy.types.Operator):
+    bl_idname = "bim.add_bcf_viewpoint"
+    bl_label = "Add BCF Viewpoint"
+
+    def execute(self, context):
+        if not bpy.context.scene.camera:
+            return {"FINISHED"}
+        bcfxml = bcfstore.BcfStore.get_bcfxml()
+        props = bpy.context.scene.BCFProperties
+        blender_topic = props.topics[props.active_topic_index]
+        topic = bcfxml.topics[blender_topic.name]
+        viewpoint = bcf.data.Viewpoint()
+
+        if bpy.context.scene.camera.data.type == "ORTHO":
+            camera = bcf.data.OrthogonalCamera()
+            camera.view_to_world_scale = bpy.context.scene.camera.data.ortho_scale
+            viewpoint.orthogonal_camera = camera
+        elif bpy.context.scene.camera.data.type == "PERSP":
+            camera = bcf.data.PerspectiveCamera()
+            camera.field_of_view = degrees(bpy.context.scene.camera.data.angle)
+            viewpoint.perspective_camera = camera
+        camera.camera_view_point.x = bpy.context.scene.camera.location.x
+        camera.camera_view_point.y = bpy.context.scene.camera.location.y
+        camera.camera_view_point.z = bpy.context.scene.camera.location.z
+        direction = bpy.context.scene.camera.matrix_world.to_quaternion() @ Vector((0.0, 0.0, -1.0))
+        camera.camera_direction.x = direction.x
+        camera.camera_direction.y = direction.y
+        camera.camera_direction.z = direction.z
+        up = bpy.context.scene.camera.matrix_world.to_quaternion() @ Vector((0.0, 1.0, 0.0))
+        camera.camera_up_vector.x = up.x
+        camera.camera_up_vector.y = up.y
+        camera.camera_up_vector.z = up.z
+
+        old_file_format = bpy.context.scene.render.image_settings.file_format
+        bpy.context.scene.render.image_settings.file_format = "PNG"
+        old_filepath = bpy.context.scene.render.filepath
+        bpy.context.scene.render.filepath = os.path.join(bpy.context.scene.BIMProperties.data_dir, "snapshot.png")
+        bpy.ops.render.opengl(write_still=True)
+        viewpoint.snapshot = bpy.context.scene.render.filepath
+
+        bcfxml.add_viewpoint(topic, viewpoint)
+        bpy.context.scene.render.filepath = old_filepath
+        bpy.context.scene.render.image_settings.file_format = old_file_format
+        props.active_topic_index = props.active_topic_index # refreshes the BCF Topic
+        return {"FINISHED"}
+
+
 class RemoveBcfViewpoint(bpy.types.Operator):
     bl_idname = "bim.remove_bcf_viewpoint"
     bl_label = "Remove BCF Viewpoint"
@@ -896,6 +943,8 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         return {"FINISHED"}
 
     def set_viewpoint_components(self, viewpoint):
+        if not viewpoint.components:
+            return
         selected_global_ids = [s.ifc_guid for s in viewpoint.components.selection]
         exception_global_ids = [v.ifc_guid for v in viewpoint.components.visibility.exceptions]
         global_id_colours = {}
diff --git a/src/ifcblenderexport/blenderbim/bim/ui.py b/src/ifcblenderexport/blenderbim/bim/ui.py
index 010a47678f..7d341a2d8b 100644
--- a/src/ifcblenderexport/blenderbim/bim/ui.py
+++ b/src/ifcblenderexport/blenderbim/bim/ui.py
@@ -1696,6 +1696,7 @@ class BIM_PT_bcf(Panel):
             row = layout.row()
             row.prop(topic, "viewpoints")
             row.operator("bim.activate_bcf_viewpoint", icon="SCENE", text="")
+            row.operator("bim.add_bcf_viewpoint", icon="ADD", text="")
             row.operator("bim.remove_bcf_viewpoint", icon="X", text="")
 
             col = layout.column(align=True)