diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 689de58428e..f09ad1c903d 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -372,7 +372,7 @@ FilePath VcsBasePluginState::currentFileDirectory() const
 QString VcsBasePluginState::relativeCurrentFile() const
 {
     QTC_ASSERT(hasFile(), return {});
-    return data->m_state.currentFile.relativePath(data->m_state.currentFileTopLevel).toString();
+    return data->m_state.currentFile.relativeChildPath(data->m_state.currentFileTopLevel).toString();
 }
 
 QString VcsBasePluginState::currentPatchFile() const
@@ -403,9 +403,7 @@ FilePath VcsBasePluginState::currentProjectTopLevel() const
 QString VcsBasePluginState::relativeCurrentProject() const
 {
     QTC_ASSERT(hasProject(), return QString());
-    if (data->m_state.currentProjectTopLevel == data->m_state.currentProjectPath)
-        return {};
-    return data->m_state.currentProjectPath.relativePath(data->m_state.currentProjectTopLevel).toString();
+    return data->m_state.currentProjectPath.relativeChildPath(data->m_state.currentProjectTopLevel).toString();
 }
 
 bool VcsBasePluginState::hasTopLevel() const