diff --git a/src/plugins/coreplugin/find/treeviewfind.cpp b/src/plugins/coreplugin/find/treeviewfind.cpp
index 6a1c9375571c4fa0a64fe3bbe24d2f157e129b84..eb3ee75e18f6e08b53ebad3d43358d91e3d05d44 100644
--- a/src/plugins/coreplugin/find/treeviewfind.cpp
+++ b/src/plugins/coreplugin/find/treeviewfind.cpp
@@ -29,9 +29,13 @@
 
 #include "treeviewfind.h"
 
-#include <QTreeView>
-#include <QTextCursor>
+#include <aggregation/aggregate.h>
+#include <coreplugin/findplaceholder.h>
+
 #include <QModelIndex>
+#include <QTextCursor>
+#include <QTreeView>
+#include <QVBoxLayout>
 
 namespace Core {
 
@@ -126,6 +130,22 @@ IFindSupport::Result TreeViewFind::findStep(const QString &txt, FindFlags findFl
     return result;
 }
 
+QWidget *TreeViewFind::createSearchableWrapper(QTreeView *treeView)
+{
+    QWidget *widget = new QWidget;
+    QVBoxLayout *vbox = new QVBoxLayout(widget);
+    vbox->setMargin(0);
+    vbox->setSpacing(0);
+    vbox->addWidget(treeView);
+    vbox->addWidget(new Core::FindToolBarPlaceHolder(widget));
+
+    Aggregation::Aggregate *agg = new Aggregation::Aggregate;
+    agg->add(treeView);
+    agg->add(new TreeViewFind(treeView));
+
+    return widget;
+}
+
 IFindSupport::Result TreeViewFind::find(const QString &searchTxt,
                                         FindFlags findFlags,
                                         bool startFromCurrentIndex,
diff --git a/src/plugins/coreplugin/find/treeviewfind.h b/src/plugins/coreplugin/find/treeviewfind.h
index 06842d2b795daafff563c391ce3d15f56234d73e..824a469e3e4cbfdb6484ef9ed45249b5db992d14 100644
--- a/src/plugins/coreplugin/find/treeviewfind.h
+++ b/src/plugins/coreplugin/find/treeviewfind.h
@@ -58,6 +58,8 @@ public:
     Result findIncremental(const QString &txt, FindFlags findFlags);
     Result findStep(const QString &txt, FindFlags findFlags);
 
+    static QWidget *createSearchableWrapper(QTreeView *treeView);
+
 private:
     Result find(const QString &txt, FindFlags findFlags,
                 bool startFromCurrentIndex, bool *wrapped);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a362638f9d2bdd528be2dc2694bdc74ca4ddfe1e..43aefe68636b15ccf292a09a0fd63f463d97d084 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -74,6 +74,7 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/find/treeviewfind.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
@@ -125,10 +126,6 @@
 #include <QTreeWidget>
 #include <QVBoxLayout>
 
-#include <aggregation/aggregate.h>
-#include <coreplugin/findplaceholder.h>
-#include <coreplugin/find/treeviewfind.h>
-
 #ifdef WITH_TESTS
 #include <QTest>
 #include <QSignalSpy>
@@ -535,8 +532,6 @@ public:
 
 static QWidget *addSearch(BaseTreeView *treeView, const QString &title, const char *objectName)
 {
-    QWidget *widget = new QWidget;
-
     QAction *act = debuggerCore()->action(UseAlternatingRowColors);
     treeView->setAlternatingRowColors(act->isChecked());
     QObject::connect(act, SIGNAL(toggled(bool)),
@@ -547,19 +542,9 @@ static QWidget *addSearch(BaseTreeView *treeView, const QString &title, const ch
     QObject::connect(act, SIGNAL(toggled(bool)),
             treeView, SLOT(setAlwaysAdjustColumns(bool)));
 
-    QVBoxLayout *vbox = new QVBoxLayout(widget);
-    vbox->setMargin(0);
-    vbox->setSpacing(0);
-    vbox->addWidget(treeView);
-    vbox->addWidget(new Core::FindToolBarPlaceHolder(widget));
-
-    Aggregation::Aggregate *agg = new Aggregation::Aggregate;
-    agg->add(treeView);
-    agg->add(new Core::TreeViewFind(treeView));
-
+    QWidget *widget = TreeViewFind::createSearchableWrapper(treeView);
     widget->setObjectName(QLatin1String(objectName));
     widget->setWindowTitle(title);
-
     return widget;
 }