diff --git a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
index c8ea9d01c..e0e1871d2 100644
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@@ -46,3 +46,22 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
     ASSERT_TRUE (matches.size() == 1);
     ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "dwemer language");
 }
+
+
+TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
+{
+    // testing that the longest keyword is chosen, rather than maximizing the
+    // amount of highlighted characters by highlighting the first and last keyword
+    MWDialogue::KeywordSearch<std::string, int> search;
+    search.seed("foo bar", 0);
+    search.seed("bar lock", 0);
+    search.seed("lock so", 0);
+
+    std::string text = "foo bar lock so";
+
+    std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
+    search.highlightKeywords(text.begin(), text.end(), matches);
+
+    ASSERT_TRUE (matches.size() == 1);
+    ASSERT_TRUE (std::string(matches.front().mBeg, matches.front().mEnd) == "bar lock");
+}