diff --git a/src/blenderbim/blenderbim/bim/module/model/data.py b/src/blenderbim/blenderbim/bim/module/model/data.py
index b97b16c614..bef3f91a7d 100644
--- a/src/blenderbim/blenderbim/bim/module/model/data.py
+++ b/src/blenderbim/blenderbim/bim/module/model/data.py
@@ -213,6 +213,7 @@ class AuthoringData:
         if bpy.context.active_object:
             representation = tool.Geometry.get_active_representation(bpy.context.active_object)
             if representation and representation.is_a("IfcShapeRepresentation"):
+                representation = tool.Geometry.resolve_mapped_representation(representation)
                 return representation.RepresentationType
 
     @classmethod
diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py
index 0f8d59b683..7c4e881234 100644
--- a/src/blenderbim/blenderbim/bim/module/model/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py
@@ -616,6 +616,7 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
             usage = tool.Model.get_usage_type(element)
             if not usage:
                 representation = tool.Geometry.get_active_representation(obj)
+                representation = tool.Geometry.resolve_mapped_representation(representation)
                 if representation and representation.RepresentationType == "SweptSolid":
                     usage = "SWEPTSOLID"
                 else: