diff --git a/core/model/fieldtypes/Text.php b/core/model/fieldtypes/Text.php
index 8f93f8162..0790d9cc1 100644
--- a/core/model/fieldtypes/Text.php
+++ b/core/model/fieldtypes/Text.php
@@ -262,18 +262,12 @@ class Text extends DBField {
 		}
 		
 		$summary = substr($text, $position, $characters);
-		
 		$stringPieces = explode(' ', $string);
 		
 		if($highlight) {
-			// Add a span around all occurences of the search term
-			$summary = str_ireplace($string, "<span class=\"highlight\">$string</span>", $summary);
-			
 			// Add a span around all key words from the search term as well
-			if($stringPieces) {
-				foreach($stringPieces as $stringPiece) {
-					$summary = str_ireplace($stringPiece, "<span class=\"highlight\">$stringPiece</span>", $summary);
-				}
+			if($stringPieces) foreach($stringPieces as $stringPiece) {
+				$summary = str_ireplace($stringPiece, "<span class=\"highlight\">$stringPiece</span>", $summary);
 			}
 		}
 		
diff --git a/tests/fieldtypes/TextTest.php b/tests/fieldtypes/TextTest.php
index 2f6490e89..233d6c77c 100644
--- a/tests/fieldtypes/TextTest.php
+++ b/tests/fieldtypes/TextTest.php
@@ -104,5 +104,25 @@ class TextTest extends SapphireTest {
 		}
 	}
 	
+	function testContextSummary() {
+		$testString1 = '<p>This is some text. It is a test</p>';
+		$testKeywords1 = 'test';
+		$testString2 = '<p>This is some test text. Test test what if you have multiple keywords.</p>';
+		$testKeywords2 = 'some test';
+		$textObj = DBField::create('Text', $testString1, 'Text');
+		
+		$this->assertEquals(
+			'text. It is a <span class="highlight">test</span>',
+			$textObj->ContextSummary(20, $testKeywords1)
+		);
+		
+		$textObj->setValue($testString2);
+		
+		$this->assertEquals(
+			'This is <span class="highlight">some</span> <span class="highlight">test</span> text. <span class="highlight">test</span> <span class="highlight">test</span> what if you have',
+			$textObj->ContextSummary(50, $testKeywords2)
+		);
+	}
+	
 }
-?>
\ No newline at end of file
+?>