diff --git a/rigify/ui.py b/rigify/ui.py
index 7d5490e040c25d4f43fc05657a11ba398042824a..ce66da963299b13ddb458420ffeb7ea52b95261d 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -627,10 +627,13 @@ class BONE_PT_rigify_buttons(bpy.types.Panel):
 class VIEW3D_PT_tools_rigify_dev(bpy.types.Panel):
     bl_label = "Rigify Dev Tools"
     bl_category = 'Tools'
-    bl_context = "armature_edit"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'TOOLS'
 
+    @classmethod
+    def poll(cls, context):
+        return context.mode in ['EDIT_ARMATURE', 'EDIT_MESH']
+
     def draw(self, context):
         obj = context.active_object
         if obj is not None: