diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index f225632f22..40f96e724f 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -67,7 +67,13 @@ void InstallTalkWindow::setTalkFolder(QString folder)
 void InstallTalkWindow::change()
 {
     Config *cw = new Config(this,4);
-    
+   
+    // make sure the current selected folder doesn't get lost on settings
+    // changes. If the current selection is invalid don't accept it so
+    // it gets reset to the old value after closing the settings dialog. 
+    QString folderToTalk = ui.lineTalkFolder->text();
+    if(QFileInfo(folderToTalk).isDir())
+        RbSettings::setValue(RbSettings::LastTalkedFolder, folderToTalk);
     connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
     
     cw->show();