diff --git a/src/browser.cpp b/src/browser.cpp
index 6a66f286..06a7bcbf 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -53,6 +53,7 @@ namespace
 			return false;
 		
 		string ext = file.substr(last_dot+1);
+		ToLower(ext);
 		for (int i = 0; supported_extensions[i] != "."; i++)
 			if (ext == supported_extensions[i])
 				return true;
diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index bdb9704b..5c7f6a98 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -301,6 +301,7 @@ bool GetSongTags(Song &s)
 	
 	string ext = s.GetFile();
 	ext = ext.substr(ext.find_last_of(".")+1);
+	ToLower(ext);
 	
 	mTagEditor->Clear();
 	mTagEditor->Reset();
@@ -356,6 +357,7 @@ bool WriteTags(Song &s)
 		
 		string ext = s.GetFile();
 		ext = ext.substr(ext.find_last_of(".")+1);
+		ToLower(ext);
 		if (ext == "mp3")
 		{
 			MPEG::File file(path_to_file.c_str());