diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 59407acd7c68fb3412cd00b94d684e84c6f67711..bbab5eca3bf9bb54bad37a497781f312f703a973 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1000,6 +1000,11 @@ void ProjectExplorerPlugin::setCurrentFile(Project *project, const QString &file
 void ProjectExplorerPlugin::setCurrentFile(const QString &filePath)
 {
     Project *project = m_session->projectForFile(filePath);
+    // If the file is not in any project, stay with the current project
+    // e.g. on opening a git diff buffer, git log buffer, we don't change the project
+    // I'm not 100% sure this is correct
+    if (!project)
+        project = m_currentProject;
     setCurrent(project, filePath, 0);
 }