diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 801292de..25ba9737 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -867,7 +867,7 @@ void TagEditor::LocateSong(const MPD::Song &s)
 	if (itsBrowsedDir != s.GetDirectory())
 	{
 		itsBrowsedDir = s.GetDirectory();
-		itsBrowsedDir = itsBrowsedDir.substr(0, itsBrowsedDir.find('/'));
+		itsBrowsedDir = itsBrowsedDir.substr(0, itsBrowsedDir.rfind('/'));
 		if (itsBrowsedDir.empty())
 			itsBrowsedDir = "/";
 		Dirs->Clear();