diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioConnection.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioConnection.cpp
index 54ba119f2..ffb4ff7b3 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioConnection.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioConnection.cpp
@@ -152,34 +152,10 @@ public:
 
 namespace VisualStudio
 {
-	bool SameFile(HANDLE h1, HANDLE h2)
-	{
-		BY_HANDLE_FILE_INFORMATION bhfi1 = { 0 };
-		BY_HANDLE_FILE_INFORMATION bhfi2 = { 0 };
-
-		if (::GetFileInformationByHandle(h1, &bhfi1) && ::GetFileInformationByHandle(h2, &bhfi2))
-		{
-			return ((bhfi1.nFileIndexHigh == bhfi2.nFileIndexHigh) && (bhfi1.nFileIndexLow == bhfi2.nFileIndexLow) && (bhfi1.dwVolumeSerialNumber == bhfi2.dwVolumeSerialNumber));
-		}
-
-		return false;
-	}
-
 	bool AreFilePathsEqual(const wchar_t* path1, const wchar_t* path2)
-	{
-		if (wcscmp(path1, path2) == 0)
-			return true;
-
-		HANDLE file1 = CreateFileW(path1, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
-		HANDLE file2 = CreateFileW(path2, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
-
-		bool result = SameFile(file1, file2);
-
-		CloseHandle(file1);
-		CloseHandle(file2);
-
-		return result;
-	}
+    {
+		return _wcsicmp(path1, path2) == 0;
+    }
 
 	class ConnectionInternal
 	{
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
index dde2455a7..e8b221a5d 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
@@ -44,6 +44,7 @@ VisualStudioEditor::VisualStudioEditor(VisualStudioVersion version, const String
         break;
     }
     _solutionPath = Globals::ProjectFolder / Editor::Project->Name + TEXT(".sln");
+    _solutionPath.Replace('/', '\\'); // Use Windows-style path separators
 }
 
 void VisualStudioEditor::FindEditors(Array<CodeEditor*>* output)
@@ -145,7 +146,9 @@ void VisualStudioEditor::OpenFile(const String& path, int32 line)
 
     // Open file
     const VisualStudio::Connection connection(*_CLSID, *_solutionPath);
-    const auto result = connection.OpenFile(*path, line);
+    String tmp = path;
+    tmp.Replace('/', '\\'); // Use Windows-style path separators
+    const auto result = connection.OpenFile(*tmp, line);
     if (result.Failed())
     {
         LOG(Warning, "Cannot open file \'{0}\':{1}. {2}.", path, line, String(result.Message.c_str()));