diff --git a/Changelog b/Changelog
index 5ef0c9927..71bb1a47e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.9
+    - BUGFIX: Fix crash when pressing enter in save path field in torrent addition dialog
+
 * Sun Oct 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.8
     - BUGFIX: Fix possible crash on manual peer ban
     - BUGFIX: Improved hostname resolution code
diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp
index eca958982..fd4c08869 100644
--- a/src/torrentadditiondlg.cpp
+++ b/src/torrentadditiondlg.cpp
@@ -48,6 +48,10 @@ torrentAdditionDialog::torrentAdditionDialog(GUI *parent, Bittorrent* _BTSession
   connect(comboLabel, SIGNAL(editTextChanged(QString)), this, SLOT(resetComboLabelIndex(QString)));
   connect(comboLabel, SIGNAL(editTextChanged(QString)), this, SLOT(updateLabelInSavePath(QString)));
   connect(comboLabel, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateLabelInSavePath(QString)));
+
+  // Important: as a default, it inserts at the bottom which is not desirable
+  savePathTxt->setInsertPolicy(QComboBox::InsertAtCurrent);
+
   // Remember columns width
   readSettings();
   //torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);