diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index ed017b61535..c541ce52980 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -32,6 +32,8 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <aggregation/aggregate.h>
+#include <coreplugin/find/basetextfind.h>
 #include <utils/fileutils.h>
 #include <utils/outputformatter.h>
 #include <utils/theme/theme.h>
@@ -288,8 +290,12 @@ class VcsOutputWindowPrivate
 
 Internal::OutputWindowPlainTextEdit *VcsOutputWindowPrivate::plainTextEdit()
 {
-    if (!m_plainTextEdit)
+    if (!m_plainTextEdit) {
         m_plainTextEdit = new Internal::OutputWindowPlainTextEdit();
+        Aggregation::Aggregate *agg = new Aggregation::Aggregate;
+        agg->add(m_plainTextEdit);
+        agg->add(new Core::BaseTextFind(m_plainTextEdit));
+    }
     return m_plainTextEdit;
 }