diff --git a/app/views/feedback/suggest_correction.html.erb b/app/views/feedback/suggest_correction.html.erb
index d76c819f7..3f3d5dc34 100644
--- a/app/views/feedback/suggest_correction.html.erb
+++ b/app/views/feedback/suggest_correction.html.erb
@@ -1,17 +1,8 @@
-<div data-blacklight-modal="container">
-  <div class="modal-header">
-    <h3 class="modal-title">Suggest a Correction</h3>
-    <button type="button" class="close" data-dismiss="modal">×</button>
-  </div>
-  <div class="modal-body">
-    <div class="row">
-      <div id="generalFeedback" class="form-wrapper col">
-        <div class="form-wrapper">
-          <%= render partial: "catalog/suggest_correction_form",
-              locals: { form: @suggest_correction_form }
-          %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <% component.title { t('blacklight.suggest_correction.form.title') } %>
+  <% component.body do %>
+    <%= render partial: "catalog/suggest_correction_form",
+        locals: { form: @suggest_correction_form }
+    %>  
+  <% end %>
+<% end %>
diff --git a/spec/system/catalog_show_spec.rb b/spec/system/catalog_show_spec.rb
index b70b0a187..519b6f4f5 100644
--- a/spec/system/catalog_show_spec.rb
+++ b/spec/system/catalog_show_spec.rb
@@ -128,6 +128,31 @@
       expect(title_field.value).to eq("Bible, Latin.")
     end
 
+    it 'closes a modal for Suggest a Correction' do
+      if Orangelight.using_blacklight7?
+        true
+      else
+        visit "catalog/#{document_id}"
+        click_on('Suggest a Correction')
+        expect(page).to have_field('Name')
+        expect(page).to have_content('Please use this area to report errors or omissions')
+        page.find('.blacklight-modal-close').click
+        expect(page).not_to have_content('Please use this area to report errors or omissions')
+      end
+    end
+
+    it 'closes a modal for Report Harmful Language' do
+      if Orangelight.using_blacklight7?
+        true
+      else
+        visit "catalog/#{document_id}"
+        click_on('Report Harmful Language')
+        expect(page).to have_content('users may encounter offensive or harmful language')
+        page.find('.blacklight-modal-close').click
+        expect(page).not_to have_content('users may encounter offensive or harmful language')
+      end
+    end
+
     it 'opens a modal for Report Harmful Language' do
       visit "catalog/#{document_id}"
       click_on('Report Harmful Language')