diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb
index 8108bf695622080102b1df4df8290dfbe3a81cdf..3d7223bedb176844af3c29e1ba35b97a90bd1219 100644
--- a/actionpack/lib/action_controller/scaffolding.rb
+++ b/actionpack/lib/action_controller/scaffolding.rb
@@ -157,7 +157,7 @@ def render#{suffix}_scaffold(action = caller_method_name(caller))
 
                 @content_for_layout = @template.render_file(scaffold_path(action.sub(/#{suffix}$/, "")), false)
 
-                if active_layout?
+                if !active_layout.nil?
                   render :file => active_layout, :use_full_path => true
                 else
                   render :file => scaffold_path("layout")