diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index a771bd8cb..b7c3c24e1 100644
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -46,7 +46,7 @@
               <%= t("projects.reports.wizard.statuses.step_#{i + 1}") %>
             </span>
           </div>
-          <% if @edit %>
+          <% if @edit && @report.settings["template"].present? %>
             <div class="change-step" data-step-id="<%= i + 1 %>">
             </div>
           <% end %>
diff --git a/app/views/reports/wizard/_first_step.html.erb b/app/views/reports/wizard/_first_step.html.erb
index 1dcc0617f..5d9cda6fc 100644
--- a/app/views/reports/wizard/_first_step.html.erb
+++ b/app/views/reports/wizard/_first_step.html.erb
@@ -1,5 +1,5 @@
 <div class="project-selector-container">
   <%= render partial: 'reports/wizard/project_template_selector', locals: {report: report} %>
 </div>
-<div class="report-template-values-container <%= 'hidden' if report.new_record? %>">
+<div class="report-template-values-container <%= 'hidden' if report.settings["template"].blank? %>">
 </div>
diff --git a/app/views/reports/wizard/_project_template_selector.html.erb b/app/views/reports/wizard/_project_template_selector.html.erb
index 52e8269d3..f29b6e7d6 100644
--- a/app/views/reports/wizard/_project_template_selector.html.erb
+++ b/app/views/reports/wizard/_project_template_selector.html.erb
@@ -17,7 +17,7 @@
                      options_for_select(@templates.invert, @active_template),
                      prompt: t('projects.reports.wizard.first_step.select_template'),
                      data: {
-                       disable_on_load: report.settings[:template].blank?,
+                       disable_on_load: report.settings[:template].blank? && report.new_record?,
                        placeholder: t('projects.reports.wizard.first_step.select_template'),
                        selected_template: report.settings[:template],
                        values_editor_path: reports_new_template_values_path(report_id: report.id)