diff --git a/Changelog b/Changelog
index f1d75340c..44c17ed39 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.0.3
     - BUGFIX: Minor cosmetic fix to program preferences
+    - BUGFIX: Fix "Temp path" button in program preferences
 
 * Fri Dec 18 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.2
     - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusuable for new users)
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 52100d2c0..cd5c6aae8 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -1336,16 +1336,25 @@ void options_imp::on_browseFilterButton_clicked() {
 
 // Display dialog to choose save dir
 void options_imp::on_browseSaveDirButton_clicked(){
-#ifdef Q_WS_WIN
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::rootPath());
-#else
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath());
-#endif
+  QString def_path = QDir::homePath();
+  if(!textSavePath->text().isEmpty())
+    def_path = textSavePath->text();
+  QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), def_path);
   if(!dir.isNull()){
     textSavePath->setText(dir);
   }
 }
 
+void options_imp::on_browseTempDirButton_clicked(){
+  QString def_path = QDir::homePath();
+  if(!textTempPath->text().isEmpty())
+    def_path = textTempPath->text();
+  QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), def_path);
+  if(!dir.isNull()){
+    textTempPath->setText(dir);
+  }
+}
+
 // Return Filter object to apply to BT session
 QString options_imp::getFilter() const{
   return textFilterPath->text();
diff --git a/src/options_imp.h b/src/options_imp.h
index 1ae1c828f..acda46721 100644
--- a/src/options_imp.h
+++ b/src/options_imp.h
@@ -162,6 +162,7 @@ protected slots:
   void on_browseScanDirButton_clicked();
   void on_browseFilterButton_clicked();
   void on_browseSaveDirButton_clicked();
+  void on_browseTempDirButton_clicked();
   void enableApplyButton();
   void enableSystrayOptions();
   void disableSystrayOptions();