diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 6c43f47b4..6ee329aa7 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -162,7 +162,8 @@ namespace MWGui
         {
             std::string::const_iterator i = text.begin ();
             KeywordSearchT::Match match;
-            while (i != text.end () && keywordSearch->search (i, text.end (), match))
+
+            while (i != text.end () && keywordSearch->search (i, text.end (), match, false))
             {
                 if (i != match.mBeg)
                     addTopicLink (typesetter, 0, i - text.begin (), match.mBeg - text.begin ());
diff --git a/apps/openmw/mwgui/keywordsearch.hpp b/apps/openmw/mwgui/keywordsearch.hpp
index a9fb6daab..be118597c 100644
--- a/apps/openmw/mwgui/keywordsearch.hpp
+++ b/apps/openmw/mwgui/keywordsearch.hpp
@@ -66,10 +66,19 @@ public:
         return false;
     }
 
-    bool search (Point beg, Point end, Match & match)
+    bool search (Point beg, Point end, Match & match, bool matchSubword = true)
     {
+        char prev = ' ';
         for (Point i = beg; i != end; ++i)
         {
+            // check if previous character marked start of new word
+            if (!matchSubword && isalpha(prev))
+            {
+                prev = *i;
+                continue;
+            }
+            prev = *i;
+
             // check first character
             typename Entry::childen_t::iterator candidate = mRoot.mChildren.find (std::tolower (*i, mLocale));