diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h
index 0007799..5ceaf70 100644
--- a/lib/TTLS_UI/include/TTLS_UI.h
+++ b/lib/TTLS_UI/include/TTLS_UI.h
@@ -132,6 +132,7 @@ protected:
     virtual bool TransferDataFromWindow();
     virtual void OnInitDialog(wxInitDialogEvent& event);
     virtual void OnUpdateUI(wxUpdateUIEvent& event);
+    virtual void OnInnerTypeChoice(wxCommandEvent& event);
     /// \endcond
 
 protected:
diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp
index 27f1eeb..c4e406c 100644
--- a/lib/TTLS_UI/src/TTLS_UI.cpp
+++ b/lib/TTLS_UI/src/TTLS_UI.cpp
@@ -219,12 +219,14 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
     panel_pap->SetFocusFromKbd();
 
     this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI));
+    m_inner_type->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this);
 }
 
 
 wxTTLSConfigWindow::~wxTTLSConfigWindow()
 {
     this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI));
+    m_inner_type->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this);
 }
 
 
@@ -291,3 +293,9 @@ void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/)
 {
     m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only);
 }
+
+
+void wxTTLSConfigWindow::OnInnerTypeChoice(wxCommandEvent& /*event*/)
+{
+    Layout();
+}