1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 2f9616124a..95a6101109 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -284,6 +284,12 @@ module AbstractController
         layout = options.key?(:layout) ? options.delete(:layout) : :default
         value = _layout_for_option(layout)
         options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
+
+        # TODO Layout for partials should be handled here, because inside the
+        # partial renderer it looks for the layout as a partial.
+        if options.key?(:partial) && options[:layout]
+          options[:layout] = view_context.find_layout(options[:layout])
+        end
       end
     end