1 files changed, 17 insertions, 8 deletions
diff --git a/actionview/lib/action_view/layouts.rb b/actionview/lib/action_view/layouts.rb
index 9d636c8c9e..1fc609f2cd 100644
--- a/actionview/lib/action_view/layouts.rb
+++ b/actionview/lib/action_view/layouts.rb
@@ -315,16 +315,25 @@ module ActionView
             name_clause
         end
 
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def _layout
-            if _conditional_layout?
+        if self._layout_conditions.empty?
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _layout
               #{layout_definition}
-            else
-              #{name_clause}
             end
-          end
-          private :_layout
-        RUBY
+            private :_layout
+          RUBY
+        else
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _layout
+              if _conditional_layout?
+                #{layout_definition}
+              else
+                #{name_clause}
+              end
+            end
+            private :_layout
+          RUBY
+        end
       end
 
       private