diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 187e720b3e..0371015355 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -251,7 +251,7 @@ void EDA_DRAW_FRAME::OnUpdateSelectGrid( wxUpdateUIEvent& aEvent )
 {
     // No need to update the grid select box if it doesn't exist or the grid setting change
     // was made using the select box.
-    if( m_gridSelectBox == NULL || m_auxiliaryToolBar == NULL )
+    if( m_gridSelectBox == NULL )
         return;
 
     int select = wxNOT_FOUND;
diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp
index bce00a3442..5395639eae 100644
--- a/pcbnew/dialogs/dialog_set_grid.cpp
+++ b/pcbnew/dialogs/dialog_set_grid.cpp
@@ -132,7 +132,7 @@ bool DIALOG_SET_GRID::TransferDataToWindow()
     m_comboBoxGrid2->SetSelection( m_parent->m_FastGrid2 );
 
     int hk1 = ACTIONS::gridFast1.GetHotKey();
-    int hk2 = ACTIONS::gridFast1.GetHotKey();
+    int hk2 = ACTIONS::gridFast2.GetHotKey();
     m_grid1HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk1 ) ) );
     m_grid2HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk2 ) ) );