diff --git a/app/views/active_scaffold_overrides/_list.html.erb b/app/views/active_scaffold_overrides/_list.html.erb
index 820295595..53abbe148 100644
--- a/app/views/active_scaffold_overrides/_list.html.erb
+++ b/app/views/active_scaffold_overrides/_list.html.erb
@@ -3,14 +3,7 @@
   <tbody>
     <tr>
       <td class="messages-container">
-        <p class="error-message message server-error" style="display:none;">
-          <%= as_(:internal_error).html_safe %>
-          <span class="error-500"><%= as_(:error_500).html_safe %></span>
-          <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
-        </p>
-        <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
-          <%= render 'messages' %>
-        </div>
+        <%= render 'list_messages_content' %>
       </td>
     </tr>
   </tbody>
diff --git a/app/views/active_scaffold_overrides/_list_messages.html.erb b/app/views/active_scaffold_overrides/_list_messages.html.erb
index 329d1c65d..162344c71 100644
--- a/app/views/active_scaffold_overrides/_list_messages.html.erb
+++ b/app/views/active_scaffold_overrides/_list_messages.html.erb
@@ -2,16 +2,7 @@
 <tbody class="messages">
   <tr class="record even-record">
     <td colspan="<%= column_count -%>" class="messages-container">
-<% unless active_scaffold_config.list.messages_above_header %>
-      <p class="error-message message server-error" style="display:none;">
-        <%= as_(:internal_error).html_safe %>
-        <span class="error-500"><%= as_(:error_500).html_safe %></span>
-        <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
-      </p>
-      <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
-        <%= render 'messages' %>
-      </div>
-<% end %>
+      <%= render 'list_messages_content' unless active_scaffold_config.list.messages_above_header %>
       <%= content_tag :div, class: 'filtered-message',
                       style: ('display:none;' unless @filtered),
                       data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>
diff --git a/app/views/active_scaffold_overrides/_list_messages_content.html.erb b/app/views/active_scaffold_overrides/_list_messages_content.html.erb
new file mode 100644
index 000000000..cb8a416b2
--- /dev/null
+++ b/app/views/active_scaffold_overrides/_list_messages_content.html.erb
@@ -0,0 +1,8 @@
+<p class="error-message message server-error" style="display:none;">
+  <%= as_(:internal_error).html_safe %>
+  <span class="error-500"><%= as_(:error_500).html_safe %></span>
+  <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+</p>
+<div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+  <%= render 'messages' %>
+</div>