diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 53eaab3e..62a763a2 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -337,9 +337,9 @@ void TagEditor::enterPressed()
 	{
 		MPD::DirectoryIterator directory = Mpd.GetDirectories(Dirs->current()->value().second), end;
 		bool has_subdirs = directory != end;
-		directory.finish();
 		if (has_subdirs)
 		{
+			directory.finish();
 			itsHighlightedDir = itsBrowsedDir;
 			itsBrowsedDir = Dirs->current()->value().second;
 			Dirs->clear();