diff --git a/common/dialogs/dialog_grid_settings_base.cpp b/common/dialogs/dialog_grid_settings_base.cpp
index 88266c452c..0472e755df 100644
--- a/common/dialogs/dialog_grid_settings_base.cpp
+++ b/common/dialogs/dialog_grid_settings_base.cpp
@@ -137,7 +137,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
 	m_grid1Ctrl->SetSelection( 0 );
 	m_grid1Ctrl->SetMinSize( wxSize( 240,-1 ) );
 
-	fgSizer3->Add( m_grid1Ctrl, 1, wxALL, 5 );
+	fgSizer3->Add( m_grid1Ctrl, 1, wxALL|wxEXPAND, 5 );
 
 	m_grid1HotKey = new wxStaticText( sbFastSwitchSizer->GetStaticBox(), wxID_ANY, _("(hotkey)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_grid1HotKey->Wrap( -1 );
@@ -152,7 +152,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
 	m_grid2Ctrl->SetSelection( 0 );
 	m_grid2Ctrl->SetMinSize( wxSize( 240,-1 ) );
 
-	fgSizer3->Add( m_grid2Ctrl, 1, wxALL, 5 );
+	fgSizer3->Add( m_grid2Ctrl, 1, wxALL|wxEXPAND, 5 );
 
 	m_grid2HotKey = new wxStaticText( sbFastSwitchSizer->GetStaticBox(), wxID_ANY, _("(hotkey)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_grid2HotKey->Wrap( -1 );
diff --git a/common/dialogs/dialog_grid_settings_base.fbp b/common/dialogs/dialog_grid_settings_base.fbp
index ec7c77b8c8..6a95edfc55 100644
--- a/common/dialogs/dialog_grid_settings_base.fbp
+++ b/common/dialogs/dialog_grid_settings_base.fbp
@@ -1206,7 +1206,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
                                     <property name="proportion">1</property>
                                     <object class="wxChoice" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -1392,7 +1392,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
                                     <property name="proportion">1</property>
                                     <object class="wxChoice" expanded="1">
                                         <property name="BottomDockable">1</property>