diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp
index 7828cc13724..1478cbbc718 100644
--- a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp
+++ b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp
@@ -4,6 +4,7 @@
 #include "externaltoolsfilter.h"
 
 #include "../coreconstants.h"
+#include "../coreplugin.h"
 #include "../coreplugintr.h"
 #include "../externaltool.h"
 #include "../externaltoolmanager.h"
@@ -30,26 +31,6 @@ QList<LocatorFilterEntry> ExternalToolsFilter::matchesFor(QFutureInterface<Locat
     return m_results;
 }
 
-void ExternalToolsFilter::accept(const LocatorFilterEntry &selection,
-                                 QString *newText, int *selectionStart, int *selectionLength) const
-{
-    Q_UNUSED(newText)
-    Q_UNUSED(selectionStart)
-    Q_UNUSED(selectionLength)
-
-    if (!selection.internalData.isValid()) {
-        ICore::showOptionsDialog(Constants::SETTINGS_ID_TOOLS);
-        return;
-    }
-
-    auto tool = selection.internalData.value<ExternalTool *>();
-    QTC_ASSERT(tool, return);
-
-    auto runner = new ExternalToolRunner(tool);
-    if (runner->hasError())
-        MessageManager::writeFlashing(runner->errorString());
-}
-
 void ExternalToolsFilter::prepareSearch(const QString &entry)
 {
     QList<LocatorFilterEntry> bestEntries;
@@ -66,8 +47,14 @@ void ExternalToolsFilter::prepareSearch(const QString &entry)
         }
 
         if (index >= 0) {
-            LocatorFilterEntry filterEntry(this, tool->displayName());
-            filterEntry.internalData = QVariant::fromValue(tool);
+            LocatorFilterEntry filterEntry;
+            filterEntry.displayName = tool->displayName();
+            filterEntry.acceptor = [tool] {
+                auto runner = new ExternalToolRunner(tool);
+                if (runner->hasError())
+                    MessageManager::writeFlashing(runner->errorString());
+                return AcceptResult();
+            };
             filterEntry.extraInfo = tool->description();
             filterEntry.highlightInfo = LocatorFilterEntry::HighlightInfo(index, entry.length(), hDataType);
 
@@ -81,6 +68,12 @@ void ExternalToolsFilter::prepareSearch(const QString &entry)
     }
     LocatorFilterEntry configEntry(this, "Configure External Tool...");
     configEntry.extraInfo = "Opens External Tool settings";
+    configEntry.acceptor = [] {
+        QMetaObject::invokeMethod(CorePlugin::instance(), [] {
+            ICore::showOptionsDialog(Constants::SETTINGS_ID_TOOLS);
+        }, Qt::QueuedConnection);
+        return AcceptResult();
+    };
     m_results = {};
     m_results << bestEntries << betterEntries << goodEntries << configEntry;
 }
diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.h b/src/plugins/coreplugin/locator/externaltoolsfilter.h
index 74d5214aa38..e97c04c2768 100644
--- a/src/plugins/coreplugin/locator/externaltoolsfilter.h
+++ b/src/plugins/coreplugin/locator/externaltoolsfilter.h
@@ -14,12 +14,9 @@ class ExternalToolsFilter : public ILocatorFilter
 public:
     ExternalToolsFilter();
 
+    void prepareSearch(const QString &entry) override;
     QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                          const QString &entry) override;
-    void accept(const LocatorFilterEntry &selection,
-                QString *newText, int *selectionStart, int *selectionLength) const override;
-    void prepareSearch(const QString &entry) override;
-
 private:
     QList<LocatorFilterEntry> m_results;
 };