diff --git a/pcbnew/dialogs/panel_display_options_base.cpp b/pcbnew/dialogs/panel_display_options_base.cpp
index 49ad6b7ac6..f5a8f81390 100644
--- a/pcbnew/dialogs/panel_display_options_base.cpp
+++ b/pcbnew/dialogs/panel_display_options_base.cpp
@@ -75,7 +75,7 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
 
 	m_checkCrossProbeCenter = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Center view on cross-probed items"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_checkCrossProbeCenter->SetValue(true);
-	sbSizer3->Add( m_checkCrossProbeCenter, 0, wxALL, 5 );
+	sbSizer3->Add( m_checkCrossProbeCenter, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_checkCrossProbeZoom = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Zoom to fit cross-probed items"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_checkCrossProbeZoom->SetValue(true);
@@ -96,7 +96,7 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind
 	pcbOptionsSizer->Fit( pcbPage );
 	m_optionsBook->AddPage( pcbPage, _("a page"), false );
 
-	bupperSizer->Add( m_optionsBook, 1, wxEXPAND | wxALL, 5 );
+	bupperSizer->Add( m_optionsBook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 
 	bMainSizer->Add( bupperSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
diff --git a/pcbnew/dialogs/panel_display_options_base.fbp b/pcbnew/dialogs/panel_display_options_base.fbp
index 5f1a7040df..aa1956365d 100644
--- a/pcbnew/dialogs/panel_display_options_base.fbp
+++ b/pcbnew/dialogs/panel_display_options_base.fbp
@@ -76,7 +76,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND | wxALL</property>
+                            <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxSimplebook" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -610,7 +610,7 @@
                                                     <property name="permission">none</property>
                                                     <object class="sizeritem" expanded="1">
                                                         <property name="border">5</property>
-                                                        <property name="flag">wxALL</property>
+                                                        <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
                                                         <property name="proportion">0</property>
                                                         <object class="wxCheckBox" expanded="1">
                                                             <property name="BottomDockable">1</property>