diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index e626cc4a34..e6e7ff7018 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -387,6 +387,9 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
 
     UpdateStatusBar();
     m_canvas->Refresh();
+    // Needed on Windows because clicking on m_gridSelectBox remove the focus from m_canvas
+    // (Windows specific
+    m_canvas->SetFocus();
 }
 
 
@@ -463,6 +466,9 @@ void EDA_DRAW_FRAME::OnSelectZoom( wxCommandEvent& event )
     m_toolManager->RunAction( ACTIONS::zoomPreset, true, static_cast<intptr_t>( id ) );
     UpdateStatusBar();
     m_canvas->Refresh();
+    // Needed on Windows because clicking on m_zoomSelectBox remove the focus from m_canvas
+    // (Windows specific
+    m_canvas->SetFocus();
 }
 
 
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index a0359c2a3f..7503e0f50b 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -192,6 +192,9 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
             GetDesignSettings().m_TempOverrideTrackWidth = true;
         }
 
+        // Needed on Windows because the canvas loses focus after clicking on m_SelTrackWidthBox:
+        GetCanvas()->SetFocus();
+
         break;
 
     case ID_AUX_TOOLBAR_PCB_VIA_SIZE:
@@ -212,6 +215,9 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
             GetDesignSettings().SetViaSizeIndex( ii );
         }
 
+        // Needed on Windows because the canvas loses focus after clicking on m_SelViaSizeBox:
+        GetCanvas()->SetFocus();
+
         break;
 
     default: