diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index 63cc3588014cf4378d053e56d80b040f416933c1..153ba95b4daadaf4b6f2cbbf8607352c1edcd0da 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -124,6 +124,7 @@ QString AllProjectsFind::label() const
 
 QString AllProjectsFind::toolTip() const
 {
+    // %2 is filled by BaseFileFind::runNewSearch
     return tr("Filter: %1\n%2").arg(fileNameFilters().join(QLatin1String(",")));
 }
 
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 7da08853f290f734a3a93d264b772da2692cd876..087ce6542952da5cf9d294c4410301018e537918 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -84,6 +84,7 @@ QString FindInCurrentFile::label() const
 
 QString FindInCurrentFile::toolTip() const
 {
+    // %2 is filled by BaseFileFind::runNewSearch
     return tr("File path: %1\n%2").arg(QDir::toNativeSeparators(m_currentFile->fileName()));
 }
 
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index baf0e6ca8dfcdd18d40613e2c9df15acc4490da4..988421132668d8cae61fb2ee1c0ec3585ca486ce 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -70,19 +70,24 @@ void FindInFiles::findAll(const QString &txt, Find::FindFlags findFlags)
 
 Utils::FileIterator *FindInFiles::files() const
 {
-    return new Utils::SubDirFileIterator(QStringList() << m_directory->currentText(),
+    return new Utils::SubDirFileIterator(QStringList() << QDir::fromNativeSeparators(m_directory->currentText()),
                                          fileNameFilters(),
                                          Core::EditorManager::instance()->defaultTextCodec());
 }
 
 QString FindInFiles::label() const
 {
-    return tr("Directory '%1':").arg(QFileInfo(m_directory->currentText()).fileName());
+    const QStringList &nonEmptyComponents = QDir::cleanPath(
+                QFileInfo(QDir::fromNativeSeparators(m_directory->currentText())).absoluteFilePath())
+            .split(QLatin1Char('/'), QString::SkipEmptyParts);
+    return tr("Directory '%1':").arg(nonEmptyComponents.isEmpty() ? "/" : nonEmptyComponents.last());
 }
 
 QString FindInFiles::toolTip() const
 {
-    return tr("Path: %1\nFilter: %2\n%3").arg(QFileInfo(m_directory->currentText()).absoluteFilePath())
+    // %3 is filled by BaseFileFind::runNewSearch
+    return tr("Path: %1\nFilter: %2\n%3")
+            .arg(QDir::toNativeSeparators(QFileInfo(m_directory->currentText()).absoluteFilePath()))
             .arg(fileNameFilters().join(QLatin1String(",")));
 }