diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
index b2c39f5157..737da76610 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@@ -505,6 +505,9 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent,
     m_modified = false;
     m_width = 0;
 
+    // Rigs the wxGrid to highlight the active column properly on Windows on keyboard nav
+    m_grid->SetSelectionMode( wxGrid::wxGridSelectRows );
+
     // Connect Events
     m_grid->Connect( wxEVT_GRID_COL_SORT,
                      wxGridEventHandler( DIALOG_LIB_EDIT_PIN_TABLE::OnColSort ), nullptr, this );