diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
index 29f9c2affd..abd5110066 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
@@ -36,7 +36,7 @@ PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* pare
 	m_staticTextInfoMaskMinWidth1->Wrap( -1 );
 	m_staticTextInfoMaskMinWidth1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-	bSizer4->Add( m_staticTextInfoMaskMinWidth1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer4->Add( m_staticTextInfoMaskMinWidth1, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
 	bMessages->Add( bSizer4, 1, wxEXPAND, 5 );
@@ -135,12 +135,11 @@ PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* pare
 	bSizer3->Add( m_staticTextInfoPaste, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
-	bMainSizer->Add( bSizer3, 1, wxRIGHT|wxLEFT, 5 );
+	bMainSizer->Add( bSizer3, 1, wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
 	this->SetSizer( bMainSizer );
 	this->Layout();
-	bMainSizer->Fit( this );
 }
 
 PANEL_SETUP_MASK_AND_PASTE_BASE::~PANEL_SETUP_MASK_AND_PASTE_BASE()
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
index c747ffba25..129b2a821a 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
@@ -43,7 +43,7 @@
             <property name="minimum_size"></property>
             <property name="name">PANEL_SETUP_MASK_AND_PASTE_BASE</property>
             <property name="pos"></property>
-            <property name="size">-1,-1</property>
+            <property name="size">727,280</property>
             <property name="subclass">; forward_declare</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
@@ -56,7 +56,7 @@
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxRIGHT|wxLEFT</property>
+                    <property name="flag">wxRIGHT|wxLEFT|wxEXPAND</property>
                     <property name="proportion">1</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
@@ -202,7 +202,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
                                             <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="1">
                                                 <property name="BottomDockable">1</property>
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
index d52e487559..c18201d653 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.h
@@ -55,7 +55,7 @@ class PANEL_SETUP_MASK_AND_PASTE_BASE : public wxPanel
 
 	public:
 
-		PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 727,280 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 		~PANEL_SETUP_MASK_AND_PASTE_BASE();
 
 };