diff --git a/pcbnew/dialogs/dialog_textbox_properties.cpp b/pcbnew/dialogs/dialog_textbox_properties.cpp
index 031f7963ec..70055f0d1b 100644
--- a/pcbnew/dialogs/dialog_textbox_properties.cpp
+++ b/pcbnew/dialogs/dialog_textbox_properties.cpp
@@ -150,6 +150,8 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare
              nullptr, this );
 
     finishDialogSettings();
+	Layout();
+	bMainSizer->Fit( this );
 }
 
 
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.cpp b/pcbnew/dialogs/dialog_textbox_properties_base.cpp
index 75e64687b2..ec27dd61d9 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.cpp
@@ -17,7 +17,6 @@ DIALOG_TEXTBOX_PROPERTIES_BASE::DIALOG_TEXTBOX_PROPERTIES_BASE( wxWindow* parent
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
 
-	wxBoxSizer* bMainSizer;
 	bMainSizer = new wxBoxSizer( wxVERTICAL );
 
 	m_MultiLineSizer = new wxBoxSizer( wxVERTICAL );
@@ -68,7 +67,6 @@ DIALOG_TEXTBOX_PROPERTIES_BASE::DIALOG_TEXTBOX_PROPERTIES_BASE( wxWindow* parent
 	gbSizer1 = new wxGridBagSizer( 3, 3 );
 	gbSizer1->SetFlexibleDirection( wxBOTH );
 	gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	gbSizer1->SetEmptyCellSize( wxSize( -1,8 ) );
 
 	m_cbLocked = new wxCheckBox( this, wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, 0 );
 	gbSizer1->Add( m_cbLocked, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.fbp b/pcbnew/dialogs/dialog_textbox_properties_base.fbp
index c53fc85b5c..0231da99e3 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.fbp
@@ -64,7 +64,7 @@
         <property name="minimum_size"></property>
         <property name="name">bMainSizer</property>
         <property name="orient">wxVERTICAL</property>
-        <property name="permission">none</property>
+        <property name="permission">protected</property>
         <object class="sizeritem" expanded="true">
           <property name="border">10</property>
           <property name="flag">wxEXPAND|wxALL</property>
@@ -212,7 +212,7 @@
           <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
           <property name="proportion">0</property>
           <object class="wxGridBagSizer" expanded="true">
-            <property name="empty_cell_size">-1,8</property>
+            <property name="empty_cell_size">-1,-1</property>
             <property name="flexible_direction">wxBOTH</property>
             <property name="growablecols">3</property>
             <property name="growablerows"></property>
@@ -558,14 +558,14 @@
                 <event name="OnChoice">onFontSelected</event>
               </object>
             </object>
-            <object class="gbsizeritem" expanded="false">
+            <object class="gbsizeritem" expanded="true">
               <property name="border">8</property>
               <property name="colspan">3</property>
               <property name="column">4</property>
               <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT</property>
               <property name="row">3</property>
               <property name="rowspan">1</property>
-              <object class="wxBoxSizer" expanded="false">
+              <object class="wxBoxSizer" expanded="true">
                 <property name="minimum_size"></property>
                 <property name="name">bSizerButtonBar</property>
                 <property name="orient">wxHORIZONTAL</property>
diff --git a/pcbnew/dialogs/dialog_textbox_properties_base.h b/pcbnew/dialogs/dialog_textbox_properties_base.h
index 8f6a500d20..82c87694e1 100644
--- a/pcbnew/dialogs/dialog_textbox_properties_base.h
+++ b/pcbnew/dialogs/dialog_textbox_properties_base.h
@@ -46,6 +46,7 @@ class DIALOG_TEXTBOX_PROPERTIES_BASE : public DIALOG_SHIM
 	private:
 
 	protected:
+		wxBoxSizer* bMainSizer;
 		wxBoxSizer* m_MultiLineSizer;
 		wxStyledTextCtrl* m_MultiLineText;
 		wxCheckBox* m_cbLocked;