diff --git a/source/list/list.cpp b/source/list/list.cpp
index 13e6fa81..4ec088b5 100644
--- a/source/list/list.cpp
+++ b/source/list/list.cpp
@@ -401,18 +401,19 @@ void CList<dir_discHdr>::GetHeaders(safe_vector<string> pathlist, safe_vector<di
 					{
 						strncpy(tmp.path, (*itr).c_str(), sizeof(tmp.path));
 
-						(*itr).assign(&(*itr)[(*itr).find_last_of('/') + 1]);
-
-						char filename[64];
-						strncpy(filename, (*itr).c_str(), sizeof(filename));
-
 						int plugin_ccolor;
 						sscanf(plugin.getString("PLUGIN","coverColor","").c_str(), "%08x", &plugin_ccolor);
 						int ccolor = custom_titles.getColor("COVERS", (const char *) tmp.hdr.id, plugin_ccolor).intVal();
 						tmp.hdr.casecolor = ccolor != plugin_ccolor ? ccolor : plugin_ccolor;
 
-						mbstowcs(tmp.title, filename, sizeof(tmp.title));
+						char tempname[64];
+						(*itr).assign(&(*itr)[(*itr).find_last_of('/') + 1]);
+						if((*itr).find_last_of('.') != string::npos)
+							(*itr).erase((*itr).find_last_of('.'), (*itr).size() - (*itr).find_last_of('.'));
+						strncpy(tempname, (*itr).c_str(), sizeof(tempname));
+						mbstowcs(tmp.title, tempname, sizeof(tmp.title));
 						Asciify(tmp.title);
+
 						gprintf("Found: %s\n", tmp.path);
 						sscanf(plugin.getString("PLUGIN","magic","").c_str(), "%08x", &tmp.hdr.magic); //Plugin magic
 						tmp.hdr.gc_magic = 0x4c4f4c4f; //Abusing gc_magic for general emu detection ;)
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index 7c736d88..899996ee 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -1482,7 +1482,13 @@ void CMenu::_initCF(void)
 				m_dump.setWString(domain, id, m_gameList[i].title);
 
 			if (m_current_view == COVERFLOW_EMU)
-				m_cf.addItem(&m_gameList[i], sfmt("%s/%s.png", m_picDir.c_str(), &m_gameList[i].path[std::string(m_gameList[i].path).find_last_of("/")]).c_str(), sfmt("%s/%s.png", m_boxPicDir.c_str(), &m_gameList[i].path[std::string(m_gameList[i].path).find_last_of("/")]).c_str(), playcount, lastPlayed);
+			{
+				string tempname(m_gameList[i].path);
+				tempname.assign(&tempname[tempname.find_last_of('/') + 1]);
+				if(tempname.find_last_of('.') != string::npos)
+					tempname.erase(tempname.find_last_of('.'), tempname.size() - tempname.find_last_of('.'));
+				m_cf.addItem(&m_gameList[i], sfmt("%s/%s.png", m_picDir.c_str(), tempname.c_str()).c_str(), sfmt("%s/%s.png", m_boxPicDir.c_str(), tempname.c_str()).c_str(), playcount, lastPlayed);
+			}
 			else if (m_current_view != COVERFLOW_HOMEBREW)
 				m_cf.addItem(&m_gameList[i], sfmt("%s/%s.png", m_picDir.c_str(), id.c_str()).c_str(), sfmt("%s/%s.png", m_boxPicDir.c_str(), id.c_str()).c_str(), playcount, lastPlayed);
 			else 
@@ -2253,4 +2259,4 @@ void CMenu::RemoveCover( char * id )
 		SAFE_CLOSE(fp);
 		remove(fmt("%s/%s.wfc", m_cacheDir.c_str(), id));
 	}	
-}
\ No newline at end of file
+}