diff --git a/src/blenderbim/blenderbim/bim/__init__.py b/src/blenderbim/blenderbim/bim/__init__.py
index 159bd62b6e..3f4e755006 100644
--- a/src/blenderbim/blenderbim/bim/__init__.py
+++ b/src/blenderbim/blenderbim/bim/__init__.py
@@ -139,6 +139,7 @@ classes = [
     # Geometry and materials
     ui.BIM_PT_tab_representations,
     ui.BIM_PT_tab_geometric_relationships,
+    ui.BIM_PT_tab_parametric_geometry,
     ui.BIM_PT_tab_materials,
     ui.BIM_PT_tab_styles,
     # Drawings and documents
diff --git a/src/blenderbim/blenderbim/bim/module/model/ui.py b/src/blenderbim/blenderbim/bim/module/model/ui.py
index cb94c66d83..75837229cb 100644
--- a/src/blenderbim/blenderbim/bim/module/model/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/model/ui.py
@@ -172,8 +172,9 @@ class BIM_PT_array(bpy.types.Panel):
     bl_idname = "BIM_PT_array"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -240,8 +241,9 @@ class BIM_PT_stair(bpy.types.Panel):
     bl_idname = "BIM_PT_stair"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -298,8 +300,9 @@ class BIM_PT_sverchok(bpy.types.Panel):
     bl_idname = "BIM_PT_sverchok"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -336,8 +339,9 @@ class BIM_PT_window(bpy.types.Panel):
     bl_idname = "BIM_PT_window"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -445,8 +449,9 @@ class BIM_PT_door(bpy.types.Panel):
     bl_idname = "BIM_PT_door"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -518,8 +523,9 @@ class BIM_PT_railing(bpy.types.Panel):
     bl_idname = "BIM_PT_railing"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -580,8 +586,9 @@ class BIM_PT_roof(bpy.types.Panel):
     bl_idname = "BIM_PT_roof"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
-    bl_context = "modifier"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_tab_parametric_geometry"
 
     @classmethod
     def poll(cls, context):
diff --git a/src/blenderbim/blenderbim/bim/ui.py b/src/blenderbim/blenderbim/bim/ui.py
index 0b44a28256..f320450ed5 100644
--- a/src/blenderbim/blenderbim/bim/ui.py
+++ b/src/blenderbim/blenderbim/bim/ui.py
@@ -505,6 +505,23 @@ class BIM_PT_tab_geometric_relationships(Panel):
     bl_region_type = "WINDOW"
     bl_context = "scene"
     bl_order = 1
+    bl_options = {"DEFAULT_CLOSED"}
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Blender.is_tab(context, "GEOMETRY") and tool.Ifc.get()
+
+    def draw(self, context):
+        pass
+
+
+class BIM_PT_tab_parametric_geometry(Panel):
+    bl_label = "Parametric Geometry"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_order = 1
+    bl_options = {"DEFAULT_CLOSED"}
 
     @classmethod
     def poll(cls, context):