diff --git a/apps/opencs/model/tools/search.cpp b/apps/opencs/model/tools/search.cpp
index cb8850754..7eb531161 100644
--- a/apps/opencs/model/tools/search.cpp
+++ b/apps/opencs/model/tools/search.cpp
@@ -276,4 +276,21 @@ void CSMTools::Search::replace (CSMDoc::Document& document, CSMWorld::IdTableBas
             new CSMWorld::ModifyCommand (*model, index, QString::fromUtf8 (newText.c_str())));
     }
 }
+
+bool CSMTools::Search::verify (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
+    const CSMWorld::UniversalId& id, const std::string& messageHint) const
+{
+    CSMDoc::Messages messages;
+
+    int row = model->getModelIndex (id.getId(),
+        model->findColumnIndex (CSMWorld::Columns::ColumnId_Id)).row();
+    
+    searchRow (model, row, messages);
+
+    for (CSMDoc::Messages::Iterator iter (messages.begin()); iter!=messages.end(); ++iter)
+        if (iter->mHint==messageHint)
+            return true;
+
+    return false;
+}
                 
diff --git a/apps/opencs/model/tools/search.hpp b/apps/opencs/model/tools/search.hpp
index c9dfc4c44..69b98bbdb 100644
--- a/apps/opencs/model/tools/search.hpp
+++ b/apps/opencs/model/tools/search.hpp
@@ -88,6 +88,10 @@ namespace CSMTools
             void replace (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
                 const CSMWorld::UniversalId& id, const std::string& messageHint,
                 const std::string& replaceText) const;
+
+            // Check if model still matches search results.
+            bool verify (CSMDoc::Document& document, CSMWorld::IdTableBase *model,
+                const CSMWorld::UniversalId& id, const std::string& messageHint) const;
     };
 }
 
diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 2038612a2..32c26ee96 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -26,6 +26,9 @@ void CSVTools::SearchSubView::replace (bool selection)
 
     bool autoDelete = CSMSettings::UserSettings::instance().setting (
         "search/auto-delete", QString ("true"))=="true";
+
+    CSMTools::Search search (mSearch);
+    CSMWorld::IdTableBase *currentTable = 0;
         
     // We are running through the indices in reverse order to avoid messing up multiple results
     // in a single string.
@@ -37,14 +40,23 @@ void CSVTools::SearchSubView::replace (bool selection)
 
         CSMWorld::IdTableBase *table = &dynamic_cast<CSMWorld::IdTableBase&> (
             *mDocument.getData().getTableModel (type));
-    
+
+        if (table!=currentTable)
+        {
+            search.configure (table);
+            currentTable = table;
+        }
+            
         std::string hint = model.getHint (*iter);
-        
-        mSearch.replace (mDocument, table, id, hint, replace);
-        mTable->flagAsReplaced (*iter);
 
-        if (autoDelete)
-            mTable->model()->removeRows (*iter, 1);
+        if (search.verify (mDocument, table, id, hint))
+        {
+            search.replace (mDocument, table, id, hint, replace);
+            mTable->flagAsReplaced (*iter);
+
+            if (autoDelete)
+                mTable->model()->removeRows (*iter, 1);
+        }
     }
 }