diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 548b29ee..a92e0c08 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -18,6 +18,7 @@
 #include "../common/TracyProtocol.hpp"
 #include "../common/TracySystem.hpp"
 #include "../common/TracyQueue.hpp"
+#include "tracy_pdqsort.h"
 #include "TracyFileRead.hpp"
 #include "TracyFileWrite.hpp"
 #include "TracyImGui.hpp"
@@ -3294,7 +3295,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
                             break;
                         }
                     }
-                    std::sort( tmpvec, dst );
+                    pdqsort_branchless( tmpvec, dst );
 
                     draw->AddLine( wpos + ImVec2( x1, offset + PlotHeight - ( tmpvec[0] - min ) * revrange * PlotHeight ), wpos + ImVec2( x1, offset + PlotHeight - ( dst[-1] - min ) * revrange * PlotHeight ), 0xFF44DDDD );
 
diff --git a/standalone/build/win32/Tracy.vcxproj b/standalone/build/win32/Tracy.vcxproj
index 39a131bf..e7d96b00 100644
--- a/standalone/build/win32/Tracy.vcxproj
+++ b/standalone/build/win32/Tracy.vcxproj
@@ -121,6 +121,7 @@
     <ClInclude Include="..\..\..\server\TracyView.hpp" />
     <ClInclude Include="..\..\..\server\tracy_benaphore.h" />
     <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp" />
+    <ClInclude Include="..\..\..\server\tracy_pdqsort.h" />
     <ClInclude Include="..\..\..\server\tracy_sema.h" />
     <ClInclude Include="..\..\libs\gl3w\GL\gl3w.h" />
     <ClInclude Include="..\..\libs\gl3w\GL\glcorearb.h" />
diff --git a/standalone/build/win32/Tracy.vcxproj.filters b/standalone/build/win32/Tracy.vcxproj.filters
index 3397f0f2..c2845152 100644
--- a/standalone/build/win32/Tracy.vcxproj.filters
+++ b/standalone/build/win32/Tracy.vcxproj.filters
@@ -155,6 +155,9 @@
     <ClInclude Include="..\..\..\common\TracyForceInline.hpp">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\server\tracy_pdqsort.h">
+      <Filter>server</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="DebugVis.natvis" />