diff --git a/ui.py b/ui.py
index e06e535..aa9ce00 100644
--- a/ui.py
+++ b/ui.py
@@ -91,8 +91,12 @@ class RP_PT_shape(bpy.types.Panel):
             row = col.row(align=True)
             row.operator('rigpicker.create_shape', icon='MESH_DATA', text='Create Shape')
             row.operator('rigpicker.mirror_shape', icon='MOD_MIRROR', text='Mirror Shape')
-            col.operator('rigpicker.name_from_bone', icon='SORTALPHA' , text='Name From Bones')
             col.prop(scn.rig_picker, 'use_pick_bone', icon='EYEDROPPER', text='Auto Bone Assign')
+            col.operator('rigpicker.name_from_bone', icon='SORTALPHA' , text='Name From Bones')
+        else:
+            col = layout.column(align=True)
+            row = col.row(align=True)
+            row.operator('rigpicker.create_shape', icon='MESH_DATA', text='Create Shape')
 
         if ob.type != 'ARMATURE':
             box = layout.box()