diff --git a/ChangeLog b/ChangeLog
index 5be82565..1af6ff7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21944,3 +21944,5 @@
 	* Added 'RDMainWindow' to rdlogin(1).
 2021-06-21 Fred Gleason <fredg@paravelsystems.com>
 	* Added 'RDMainWindow' to rdlogmanager(1).
+2021-06-21 Fred Gleason <fredg@paravelsystems.com>
+	* Added 'RDMainWindow' to rdselect(1).
diff --git a/rdselect/rdselect.cpp b/rdselect/rdselect.cpp
index 62807d4c..b3b7a313 100644
--- a/rdselect/rdselect.cpp
+++ b/rdselect/rdselect.cpp
@@ -39,7 +39,7 @@
 #include "../icons/redx.xpm"
 
 MainWidget::MainWidget(RDConfig *c,QWidget *parent)
-  : RDWidget(c,parent)
+  : RDMainWindow("rdselect",c)
 {
   //
   // Read Command Options
@@ -169,6 +169,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
   SetSystem(select_current_id);
   SetCurrentItem(select_current_id);
   select_box->clearSelection();
+
+  loadSettings(true);
 }
 
 
@@ -222,16 +224,24 @@ void MainWidget::okData()
   }
   delete proc;
 
+  saveSettings();
   exit(0);
 }
 
 
 void MainWidget::cancelData()
 {
+  saveSettings();
   exit(0);
 }
 
 
+void MainWidget::closeEvent(QCloseEvent *e)
+{
+  cancelData();
+}
+
+
 void MainWidget::resizeEvent(QResizeEvent *e)
 {
   select_current_label->setGeometry(0,10,size().width(),21);
diff --git a/rdselect/rdselect.h b/rdselect/rdselect.h
index 6fda0f91..0323dc1f 100644
--- a/rdselect/rdselect.h
+++ b/rdselect/rdselect.h
@@ -25,10 +25,11 @@
 #include <QPushButton>
 
 #include <rdconfig.h>
+#include <rdmainwindow.h>
 #include <rdmonitor_config.h>
 #include <rdwidget.h>
 
-class MainWidget : public RDWidget
+class MainWidget : public RDMainWindow
 {
   Q_OBJECT
  public:
@@ -42,6 +43,7 @@ class MainWidget : public RDWidget
   void cancelData();
   
  protected:
+  void closeEvent(QCloseEvent *e);
   void resizeEvent(QResizeEvent *e);
 
  private: