diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 7538e54..ab1462b 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -42,7 +42,8 @@ wxEND_EVENT_TABLE()
 #include "RigThread.h"
 #endif
 
-#define APPFRAME_MODEMPROPS_SIZE 240
+#define APPFRAME_MODEMPROPS_MINSIZE 20
+#define APPFRAME_MODEMPROPS_MAXSIZE 240
 
 AppFrame::AppFrame() :
         wxFrame(NULL, wxID_ANY, CUBICSDR_TITLE), activeDemodulator(NULL) {
@@ -112,8 +113,8 @@ AppFrame::AppFrame() :
             
     modemPropertiesUpdated.store(false);
     modemProps = new ModemProperties(demodPanel, wxID_ANY);
-    modemProps->SetMinSize(wxSize(APPFRAME_MODEMPROPS_SIZE,-1));
-    modemProps->SetMaxSize(wxSize(APPFRAME_MODEMPROPS_SIZE,-1));
+    modemProps->SetMinSize(wxSize(APPFRAME_MODEMPROPS_MAXSIZE,-1));
+    modemProps->SetMaxSize(wxSize(APPFRAME_MODEMPROPS_MAXSIZE,-1));
 
     modemProps->Hide();
     demodTray->Add(modemProps, 15, wxEXPAND | wxALL, 0);
@@ -1537,13 +1538,13 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
     }
     
     if (modemProps->IsShown() && modemProps->isCollapsed() && modemProps->GetMinWidth() > 22) {
-        modemProps->SetMinSize(wxSize(22,-1));
-        modemProps->SetMaxSize(wxSize(22,-1));
+        modemProps->SetMinSize(wxSize(APPFRAME_MODEMPROPS_MINSIZE,-1));
+        modemProps->SetMaxSize(wxSize(APPFRAME_MODEMPROPS_MINSIZE,-1));
         demodTray->Layout();
         modemProps->fitColumns();
     } else if (modemProps->IsShown() && !modemProps->isCollapsed() && modemProps->GetMinWidth() < 200) {
-        modemProps->SetMinSize(wxSize(APPFRAME_MODEMPROPS_SIZE,-1));
-        modemProps->SetMaxSize(wxSize(APPFRAME_MODEMPROPS_SIZE,-1));
+        modemProps->SetMinSize(wxSize(APPFRAME_MODEMPROPS_MAXSIZE,-1));
+        modemProps->SetMaxSize(wxSize(APPFRAME_MODEMPROPS_MAXSIZE,-1));
         demodTray->Layout();
         modemProps->fitColumns();
     }
diff --git a/src/ModemProperties.cpp b/src/ModemProperties.cpp
index cd490e9..8ea673e 100644
--- a/src/ModemProperties.cpp
+++ b/src/ModemProperties.cpp
@@ -4,7 +4,7 @@
 ModemProperties::ModemProperties(wxWindow *parent, wxWindowID winid,
          const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxPanel(parent, winid, pos, size, style, name) {
     
-   	m_propertyGrid = new wxPropertyGrid(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_DEFAULT_STYLE | wxPG_NO_INTERNAL_BORDER);
+   	m_propertyGrid = new wxPropertyGrid(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_DEFAULT_STYLE);
 
     bSizer = new wxBoxSizer( wxVERTICAL );