diff --git a/templates/requests/common/add_samples.mako b/templates/requests/common/add_samples.mako
index f92c82c3349..6f7a42aabf5 100644
--- a/templates/requests/common/add_samples.mako
+++ b/templates/requests/common/add_samples.mako
@@ -71,7 +71,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
             ## Render the other grids
             <% trans.sa_session.refresh( request.type.sample_form ) %>
             %for grid_index, grid_name in enumerate( request.type.sample_form.layout ):
-                ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=True )}
+                ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=True )}
             %endfor
         %else:
             <label>There are no samples.</label>
diff --git a/templates/requests/common/common.mako b/templates/requests/common/common.mako
index ac148d4bde0..dc461be8517 100644
--- a/templates/requests/common/common.mako
+++ b/templates/requests/common/common.mako
@@ -606,7 +606,7 @@
     </tr> 
 </%def>
 
-<%def name="render_request_type_sample_form_grids( grid_index, grid_name, fields_dict, displayable_sample_widgets, adding_new_samples )">
+<%def name="render_request_type_sample_form_grids( grid_index, grid_name, fields_dict, displayable_sample_widgets, show_saved_samples_read_only )">
     <%
         if not grid_name:
             grid_name = "Sample form layout %s" % str( grid_index )
@@ -629,7 +629,7 @@
                 <% trans.sa_session.refresh( request ) %>
                 %for sample_index, sample in enumerate( displayable_sample_widgets ):
                     <%
-                        if not adding_new_samples or sample_index >= len( request.samples ):
+                        if not show_saved_samples_read_only or sample_index >= len( request.samples ):
                             display_only = False
                         else:
                             display_only = True
diff --git a/templates/requests/common/edit_samples.mako b/templates/requests/common/edit_samples.mako
index 458458aaa96..125ed2bdf21 100644
--- a/templates/requests/common/edit_samples.mako
+++ b/templates/requests/common/edit_samples.mako
@@ -120,7 +120,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
             ## Render the other grids
             <% trans.sa_session.refresh( request.type.sample_form ) %>
             %for grid_index, grid_name in enumerate( request.type.sample_form.layout ):
-                ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=False )}
+                ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=False )}
             %endfor
         %else:
             <label>There are no samples.</label>
diff --git a/templates/requests/common/view_request.mako b/templates/requests/common/view_request.mako
index b77b33ddb0c..8ceab0c739a 100644
--- a/templates/requests/common/view_request.mako
+++ b/templates/requests/common/view_request.mako
@@ -162,7 +162,7 @@ ${render_samples_messages(request, is_admin, is_submitted, message, status)}
     ## Render the other grids
     <% trans.sa_session.refresh( request.type.sample_form ) %>
     %for grid_index, grid_name in enumerate( request.type.sample_form.layout ):
-        ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, adding_new_samples=False )}
+        ${render_request_type_sample_form_grids( grid_index, grid_name, request.type.sample_form.grid_fields( grid_index ), displayable_sample_widgets=displayable_sample_widgets, show_saved_samples_read_only=True )}
     %endfor
 %else:
     There are no samples.