diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 70cd8a6655c..16a15aab490 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -739,9 +739,9 @@ private:
 
 Core::IEditor *locateEditor(const char *property, const QString &entry)
 {
-    foreach (Core::IEditor *ed, Core::ICore::editorManager()->openedEditors())
-        if (ed->document()->property(property).toString() == entry)
-            return ed;
+    foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments())
+        if (document->property(property).toString() == entry)
+            return Core::EditorManager::documentModel()->editorsForDocument(document).first();
     return 0;
 }
 
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 14778f13ca5..1bf4cfc296b 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -67,9 +67,9 @@ Q_DECLARE_METATYPE(QVariant)
 
 inline Core::IEditor *locateEditor(const char *property, const QString &entry)
 {
-    foreach (Core::IEditor *ed, Core::ICore::editorManager()->openedEditors())
-        if (ed->document()->property(property).toString() == entry)
-            return ed;
+    foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments())
+        if (document->property(property).toString() == entry)
+            return Core::EditorManager::documentModel()->editorsForDocument(document).first();
     return 0;
 }
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 153e83e6e1d..c7a35604d8f 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1560,20 +1560,17 @@ static const char tagPropertyC[] = "_q_VcsBaseEditorTag";
 
 void VcsBaseEditorWidget::tagEditor(Core::IEditor *e, const QString &tag)
 {
-    e->setProperty(tagPropertyC, QVariant(tag));
+    e->document()->setProperty(tagPropertyC, QVariant(tag));
 }
 
 Core::IEditor* VcsBaseEditorWidget::locateEditorByTag(const QString &tag)
 {
-    Core::IEditor *rc = 0;
-    foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors()) {
-        const QVariant tagPropertyValue = ed->property(tagPropertyC);
-        if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag) {
-            rc = ed;
-            break;
-        }
+    foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) {
+        const QVariant tagPropertyValue = document->property(tagPropertyC);
+        if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag)
+            return Core::EditorManager::documentModel()->editorsForDocument(document).first();
     }
-    return rc;
+    return 0;
 }
 
 } // namespace VcsBase