diff --git a/app/views/software_records/_general.html.erb b/app/views/software_records/_general.html.erb
index 681502dc..7d837537 100644
--- a/app/views/software_records/_general.html.erb
+++ b/app/views/software_records/_general.html.erb
@@ -151,7 +151,7 @@
         <% if !@software_record.notes.nil? && !@software_record.notes.to_s.empty? %>
           <dt>Notes</dt>
           <dd>
-            <ul><%= @software_record.notes %></ul>
+            <ul><%= simple_format(@software_record.notes) %></ul>
           </dd>
         <% end %>
 
diff --git a/spec/views/software_records/show.html.erb_spec.rb b/spec/views/software_records/show.html.erb_spec.rb
index f34e3b34..fa97b8c1 100644
--- a/spec/views/software_records/show.html.erb_spec.rb
+++ b/spec/views/software_records/show.html.erb_spec.rb
@@ -66,6 +66,7 @@
                                                   dev_support_servers: 'dev.example.com',
                                                   date_cert_expires: '2020-01-01',
                                                   monitor_certificates: 'Yes',
+                                                  notes: "Line one\nLine two",
                                                   themes: true,
                                                   modules: true
                                                 ))
@@ -79,6 +80,7 @@
     expect(rendered).to match(/MyText/)
     expect(rendered).to match(/1/)
     expect(rendered).to match(/DUO/)
+    expect(rendered).to match(%r{Line one\n<br />Line two})
   end
 
   it 'renders change management attributes in <p>' do