diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py
index f1bad2257c0..0dfb3071c31 100644
--- a/release/scripts/startup/bl_ui/properties_object_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_object_constraint.py
@@ -853,12 +853,12 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel):
 
         ob = context.object
 
-        if ob.mode == 'POSE':
+        if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'):
             box = layout.box()
             box.alert = True
             box.label(icon='INFO', text="See Bone Constraints tab to Add Constraints to active bone")
         else:
-            layout.operator_menu_enum("object.constraint_add", "type")
+            layout.operator_menu_enum("object.constraint_add", "type", text="Add Object Constraint")
 
         for con in ob.constraints:
             self.draw_constraint(context, con)
@@ -876,7 +876,7 @@ class BONE_PT_constraints(ConstraintButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator_menu_enum("pose.constraint_add", "type")
+        layout.operator_menu_enum("pose.constraint_add", "type", text="Add Bone Constraint")
 
         for con in context.pose_bone.constraints:
             self.draw_constraint(context, con)