diff --git a/pcbnew/widgets/pcb_net_inspector_panel.cpp b/pcbnew/widgets/pcb_net_inspector_panel.cpp
index 8f643a1180..2732548f54 100644
--- a/pcbnew/widgets/pcb_net_inspector_panel.cpp
+++ b/pcbnew/widgets/pcb_net_inspector_panel.cpp
@@ -513,6 +513,8 @@ void PCB_NET_INSPECTOR_PANEL::buildNetsList( const bool rebuildColumns )
         }
     }
 
+    m_netsList->Thaw(); // Must thaw before reselecting to avoid windows selection bug
+
     if( !sel.IsEmpty() )
     {
         m_netsList->SetSelections( sel );
@@ -523,8 +525,6 @@ void PCB_NET_INSPECTOR_PANEL::buildNetsList( const bool rebuildColumns )
         m_netsList->UnselectAll();
     }
 
-    m_netsList->Thaw();
-
     m_inBuildNetsList = false;
 }