diff --git a/console/console_ext.c b/console/console_ext.c
index 0139ad77cd..e9d87c5f66 100644
--- a/console/console_ext.c
+++ b/console/console_ext.c
@@ -756,15 +756,10 @@ void rarch_console_rsound_stop(void)
   STRING HANDLING
   ============================================================ */
 
-#ifdef _XBOX
 void rarch_convert_char_to_wchar(wchar_t *buf, const char * str, size_t size)
 {
-   unsigned long dwNum = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
-   size /= sizeof(wchar_t);
-   rarch_assert(size >= dwNum);
-   MultiByteToWideChar(CP_ACP, 0, str, -1, buf, dwNum);
+   mbstowcs(buf, str, size / sizeof(wchar_t));
 }
-#endif
 
 const char * rarch_convert_wchar_to_const_char(const wchar_t * wstr)
 {
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
index 204ae163b3..db3b1b3563 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
@@ -30,9 +30,6 @@
     <Filter Include="Header Files\compat">
       <UniqueIdentifier>{cf25b88e-c7b2-4823-876a-ed0dd8020821}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\console\griffin">
-      <UniqueIdentifier>{c868cc96-a0ac-4672-a4ca-dd7c28277972}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\media\sd">
       <UniqueIdentifier>{d50021e0-79f4-42c0-b190-1c31fa4fe2b2}</UniqueIdentifier>
     </Filter>
@@ -42,6 +39,9 @@
     <Filter Include="Source Files\media\shaders">
       <UniqueIdentifier>{3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\console\griffin">
+      <UniqueIdentifier>{c868cc96-a0ac-4672-a4ca-dd7c28277972}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\console\rzlib\rzlib.c">