diff --git a/rigify/rig_ui_template.py b/rigify/rig_ui_template.py
index 7265999b2b55b81e1b3240c1fc20e6b53b06dcf1..87eef0d8a2bde4e8785eef2131383ff235f86d74 100644
--- a/rigify/rig_ui_template.py
+++ b/rigify/rig_ui_template.py
@@ -829,7 +829,7 @@ class RigUI(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_label = "Rig Main Properties"
-    bl_idname = rig_id + "_PT_rig_ui"
+    bl_idname = "VIEW3D_PT_rig_ui_" + rig_id
     bl_category = 'View'
 
     @classmethod
@@ -873,7 +873,7 @@ class RigLayers(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_label = "Rig Layers"
-    bl_idname = rig_id + "_PT_rig_layers"
+    bl_idname = "VIEW3D_PT_rig_layers_" + rig_id
     bl_category = 'View'
 
     @classmethod
diff --git a/rigify/rot_mode.py b/rigify/rot_mode.py
index 9abfecea3a41b94401443cc03be7160d4636e46d..2b2343350c71ea33a78991e90fed48690924c674 100644
--- a/rigify/rot_mode.py
+++ b/rigify/rot_mode.py
@@ -221,7 +221,7 @@ class convert():
 convert = convert()
 
 
-class ToolsPanel(bpy.types.Panel):
+class VIEW3D_PT_rigify_rot_mode(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_category = 'View'
@@ -309,7 +309,7 @@ class CONVERT_OT_quat2eu_all_actions(bpy.types.Operator):
 ### Registering ###
 
 classes = (
-    ToolsPanel,
+    VIEW3D_PT_rigify_rot_mode,
     CONVERT_OT_quat2eu_current_action,
     CONVERT_OT_quat2eu_all_actions,
 )