diff --git a/src/blenderbim/blenderbim/bim/__init__.py b/src/blenderbim/blenderbim/bim/__init__.py
index 822a2738fd..71c088c2f4 100644
--- a/src/blenderbim/blenderbim/bim/__init__.py
+++ b/src/blenderbim/blenderbim/bim/__init__.py
@@ -141,6 +141,7 @@ classes = [
     # Tabs panel
     ui.BIM_PT_tabs,
     # Project overview
+    ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
     ui.BIM_PT_tab_spatial_decomposition,
     ui.BIM_PT_tab_project_setup,
diff --git a/src/blenderbim/blenderbim/bim/module/project/__init__.py b/src/blenderbim/blenderbim/bim/module/project/__init__.py
index 141586715d..b6dc0a4f3f 100644
--- a/src/blenderbim/blenderbim/bim/module/project/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/project/__init__.py
@@ -65,6 +65,7 @@ classes = (
     prop.BIMProjectProperties,
     ui.BIM_MT_new_project,
     ui.BIM_MT_project,
+    ui.BIM_PT_new_project_wizard,
     ui.BIM_PT_project,
     ui.BIM_PT_project_library,
     ui.BIM_PT_links,
diff --git a/src/blenderbim/blenderbim/bim/module/project/ui.py b/src/blenderbim/blenderbim/bim/module/project/ui.py
index 95046122bc..81ba87db0e 100644
--- a/src/blenderbim/blenderbim/bim/module/project/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/project/ui.py
@@ -102,8 +102,6 @@ class BIM_PT_project(Panel):
                 self.draw_loaded_project_ui(context)
             else:
                 self.draw_unsaved_project_ui(context)
-        else:
-            self.draw_project_setup_ui(context)
 
     def draw_advanced_loading_ui(self, context):
         pprops = context.scene.BIMProjectProperties
@@ -243,7 +241,20 @@ class BIM_PT_project(Panel):
         row.operator("bim.select_ifc_file", icon="FILE_FOLDER", text="")
         row.operator("bim.unload_project", text="", icon="CANCEL")
 
-    def draw_project_setup_ui(self, context):
+
+class BIM_PT_new_project_wizard(Panel):
+    bl_label = "New Project Wizard"
+    bl_idname = "BIM_PT_new_project_wizard"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_options = {"HIDE_HEADER"}
+    bl_parent_id = "BIM_PT_tab_new_project_wizard"
+
+    def draw(self, context):
+        self.layout.use_property_decorate = False
+        self.layout.use_property_split = True
+
         props = context.scene.BIMProperties
         pprops = context.scene.BIMProjectProperties
         prop_with_search(self.layout, pprops, "export_schema")
diff --git a/src/blenderbim/blenderbim/bim/ui.py b/src/blenderbim/blenderbim/bim/ui.py
index 58dd962246..6cdb0cc332 100644
--- a/src/blenderbim/blenderbim/bim/ui.py
+++ b/src/blenderbim/blenderbim/bim/ui.py
@@ -427,6 +427,28 @@ class BIM_PT_tabs(Panel):
         tab_entry.enabled = enabled
 
 
+class BIM_PT_tab_new_project_wizard(Panel):
+    bl_label = "New Project Wizard"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+
+    @classmethod
+    def poll(cls, context):
+        if not tool.Blender.is_tab(context, "PROJECT"):
+            return False
+        props = context.scene.BIMProperties
+        pprops = context.scene.BIMProjectProperties
+        if pprops.is_loading:
+            return False
+        elif tool.Ifc.get() or props.ifc_file:
+            return False
+        return True
+
+    def draw(self, context):
+        pass
+
+
 class BIM_PT_tab_project_info(Panel):
     bl_label = "Project Info"
     bl_space_type = "PROPERTIES"
@@ -435,7 +457,15 @@ class BIM_PT_tab_project_info(Panel):
 
     @classmethod
     def poll(cls, context):
-        return tool.Blender.is_tab(context, "PROJECT")
+        if not tool.Blender.is_tab(context, "PROJECT"):
+            return False
+        props = context.scene.BIMProperties
+        pprops = context.scene.BIMProjectProperties
+        if pprops.is_loading:
+            return True
+        elif tool.Ifc.get() or props.ifc_file:
+            return True
+        return False
 
     def draw(self, context):
         pass