diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index d05f59cf2fc217c35738f15c069f59fe13afc74e..88dc009e731c6024458885f0e02fe34b2fd15219 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -151,7 +151,7 @@ class Archi_Pref(AddonPreferences):
     category = StringProperty(
             name="Tab Category",
             description="Choose a name for the category of the panel",
-            default="Archimesh",
+            default="Create",
             update=update_panel
             )
 
diff --git a/archimesh/achm_main_panel.py b/archimesh/achm_main_panel.py
index a2f72388967180a2b1bab5596165467aaae34026..622cb21eb422f659b1984025949372f21bb7b84c 100644
--- a/archimesh/achm_main_panel.py
+++ b/archimesh/achm_main_panel.py
@@ -399,9 +399,10 @@ class AchmPencilAction(Operator):
 class ArchimeshMainPanel(Panel):
     bl_idname = "archimesh_main_panel"
     bl_label = "Archimesh"
-    bl_space_type = 'VIEW_3D'
+    bl_space_type = "VIEW_3D"
     bl_region_type = "TOOLS"
-    bl_category = 'Archimesh'
+    bl_category = "Create"
+    bl_context = "objectmode"
 
     # ------------------------------
     # Draw UI