diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2c0eb1..be826f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 # Next Release
 
+* **Admin Feature** Feedback items now word wrap
 * Location is now updated on registration. Customers location is truncated to 2
   decimal places based on their postcode.
 * Location is also updated on changing a users postcode
diff --git a/public/static/admin/css/main.css b/public/static/admin/css/main.css
index b2e6e97..ee131c6 100644
--- a/public/static/admin/css/main.css
+++ b/public/static/admin/css/main.css
@@ -15,3 +15,7 @@ body {
   height: 400px;
   background-color: grey;
 }
+
+.feedback-text {
+  white-space: pre-wrap;
+}
diff --git a/templates/admin/feedback/index.html.ep b/templates/admin/feedback/index.html.ep
index 049449c..5e44984 100644
--- a/templates/admin/feedback/index.html.ep
+++ b/templates/admin/feedback/index.html.ep
@@ -22,7 +22,7 @@
         <h6 class="card-title">
           %= format_human_datetime $feedback->submitted_at;
         </h6>
-        <pre class="card-text"><%= truncate_text $feedback->feedbacktext => 50; %></pre>
+        <pre class="card-text feedback-text"><%= truncate_text $feedback->feedbacktext => 50; %></pre>
       </div>
       <div class="card-footer text-right">
         <a href="<%= url_for . '/' . $feedback->id %>" class="card-link">
diff --git a/templates/admin/feedback/read.html.ep b/templates/admin/feedback/read.html.ep
index 840a35b..53a32b0 100644
--- a/templates/admin/feedback/read.html.ep
+++ b/templates/admin/feedback/read.html.ep
@@ -36,7 +36,7 @@
       </h4>
       <div class="card-body">
         <div class="card-text">
-        <pre><%= $feedback->feedbacktext %></pre>
+        <pre class="feedback-text"><%= $feedback->feedbacktext %></pre>
         </div>
       </div>
     </div>