diff --git a/src/blenderbim/blenderbim/bim/module/material/__init__.py b/src/blenderbim/blenderbim/bim/module/material/__init__.py
index f5b1fbb103..4a2b06b8dc 100644
--- a/src/blenderbim/blenderbim/bim/module/material/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/material/__init__.py
@@ -56,8 +56,8 @@ classes = (
     prop.BIMMaterialProperties,
     prop.BIMObjectMaterialProperties,
     ui.BIM_PT_materials,
-    ui.BIM_PT_object_material,
     ui.BIM_PT_material,
+    ui.BIM_PT_object_material,
     ui.BIM_UL_materials,
 )
 
diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py
index ed787d53d6..6112a39c80 100644
--- a/src/blenderbim/blenderbim/bim/module/material/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/material/ui.py
@@ -103,7 +103,8 @@ class BIM_PT_object_material(Panel):
     bl_idname = "BIM_PT_object_material"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "material"
+    bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):