diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
index 87a4c2fdbee..218d4bebeed 100644
--- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
@@ -35,7 +35,13 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel):
         ob = context.object
         rd = context.scene.render
         return (ob and ob.rigid_body and (not rd.use_game_engine))
-        
+
+    def draw_header(self, context):
+        obj = context.object
+        rbo = obj.rigid_body
+        if rbo is not None:
+            self.layout.prop(rbo, "enabled", text="");
+
     def draw(self, context):
         layout = self.layout
 
@@ -46,7 +52,6 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel):
             layout.prop(rbo, "type", text="Type")
             
             row = layout.row()
-            row.prop(rbo, "enabled");
             row.prop(rbo, "kinematic", text="Animated")
 
             if rbo.type == 'ACTIVE':
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 73de00fdd40..3654f70709c 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -252,10 +252,16 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        rd = context.scene.render
         scene = context.scene
+        rd = scene.render
         return scene and (rd.engine in cls.COMPAT_ENGINES)
 
+    def draw_header(self, context):
+        scene = context.scene
+        rbw = scene.rigidbody_world
+        if rbw is not None:
+            self.layout.prop(rbw, "enabled", text="")
+
     def draw(self, context):
         layout = self.layout
 
@@ -268,8 +274,6 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel):
         else:
             split = layout.split()
             split.operator("rigidbody.world_remove")
-            layout.separator()
-            layout.prop(context.scene.rigidbody_world, "enabled")
             layout.active = rbw.enabled
 
             col = layout.column()