diff --git a/src/ORM/FieldType/DBText.php b/src/ORM/FieldType/DBText.php
index e64d4c421..88edf16a8 100644
--- a/src/ORM/FieldType/DBText.php
+++ b/src/ORM/FieldType/DBText.php
@@ -194,7 +194,7 @@ class DBText extends DBString
         }
 
         // Get raw text value, but XML encode it (as we'll be merging with HTML tags soon)
-        $text = nl2br(Convert::raw2xml($this->Plain()));
+        $text = Convert::raw2xml($this->Plain());
         $keywords = Convert::raw2xml($keywords);
 
         // Find the search string
@@ -239,7 +239,7 @@ class DBText extends DBString
             $summary = $summary . $suffix;
         }
 
-        return $summary;
+        return nl2br($summary);
     }
 
     public function scaffoldFormField($title = null, $params = null)
diff --git a/tests/php/ORM/DBHTMLTextTest.php b/tests/php/ORM/DBHTMLTextTest.php
index 1070755b1..068951707 100644
--- a/tests/php/ORM/DBHTMLTextTest.php
+++ b/tests/php/ORM/DBHTMLTextTest.php
@@ -333,6 +333,22 @@ class DBHTMLTextTest extends SapphireTest
                 'ate',
                 // it should highlight 3 letters or more.
                 'A dog <mark>ate</mark> a cat while looking at a Foobar',
+            ],
+            [
+                '<p>This is a lot of text before this but really, this is a test sentence</p>
+                 <p>with about more stuff after the line break</p>',
+                35,
+                'test',
+                '... really, this is a <mark>test</mark> sentence...'
+            ],
+            [
+                '<p>This is a lot of text before this but really, this is a test sentence</p>
+                 <p>with about more stuff after the line break</p>',
+                50,
+                'with',
+                '... sentence<br />
+<br />
+                 <mark>with</mark> about more stuff...'
             ]
         ];
     }