diff --git a/src/GUI.cpp b/src/GUI.cpp
index a9cc220b5..fc74ffa97 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -117,6 +117,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   connect(BTSession, SIGNAL(newDownloadedTorrent(QString, QString)), this, SLOT(processDownloadedFiles(QString, QString)));
   connect(BTSession, SIGNAL(downloadFromUrlFailure(QString, QString)), this, SLOT(handleDownloadFromUrlFailure(QString, QString)));
   connect(BTSession, SIGNAL(alternativeSpeedsModeChanged(bool)), this, SLOT(updateAltSpeedsBtn(bool)));
+  connect(BTSession, SIGNAL(recursiveTorrentDownloadPossible(QTorrentHandle&)), this, SLOT(askRecursiveTorrentDownloadConfirmation(QTorrentHandle&)));
 
   qDebug("create tabWidget");
   tabs = new QTabWidget();
@@ -413,6 +414,12 @@ void GUI::readParamsOnSocket() {
   }
 }
 
+void GUI::askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h) {
+  if(QMessageBox::question(this, tr("Recursive download confirmation"), tr("The torrent %1 contains torrent files, do you want to proceed with their download?").arg(h.name()), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) {
+    BTSession->recursiveTorrentDownload(h);
+  }
+}
+
 void GUI::handleDownloadFromUrlFailure(QString url, QString reason) const{
   // Display a message box
   QMessageBox::critical(0, tr("Url download error"), tr("Couldn't download file at url: %1, reason: %2.").arg(url).arg(reason));
diff --git a/src/GUI.h b/src/GUI.h
index 208157709..95f7513fa 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -116,6 +116,7 @@ protected slots:
   void addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker);
   void processDownloadedFiles(QString path, QString url);
   void finishedTorrent(QTorrentHandle& h) const;
+  void askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h);
   // Options slots
   void on_actionOptions_triggered();
   void optionsSaved();
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 68810f954..5ebc7d531 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -70,13 +70,13 @@ enum VersionType { NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL };
 
 // Main constructor
 Bittorrent::Bittorrent()
-    : m_scanFolders(ScanFoldersModel::instance(this)),
-    preAllocateAll(false), addInPause(false), ratio_limit(-1),
-    UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false),
-    DHTEnabled(false), current_dht_port(0), queueingEnabled(false),
-    torrentExport(false), exiting(false)
+  : m_scanFolders(ScanFoldersModel::instance(this)),
+  preAllocateAll(false), addInPause(false), ratio_limit(-1),
+  UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false),
+  DHTEnabled(false), current_dht_port(0), queueingEnabled(false),
+  torrentExport(false), exiting(false)
 #ifndef DISABLE_GUI
-    , geoipDBLoaded(false), resolve_countries(false)
+  , geoipDBLoaded(false), resolve_countries(false)
 #endif
 {
   // To avoid some exceptions
@@ -1814,6 +1814,26 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
 #endif
   }
 
+  void Bittorrent::recursiveTorrentDownload(const QTorrentHandle &h) {
+    for(int i=0; i<h.get_torrent_info().num_files(); ++i) {
+      const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string());
+      if(torrent_relpath.endsWith(".torrent")) {
+        addConsoleMessage(tr("Recursive download of file %1 embedded in torrent %2", "Recursive download of test.torrent embedded in torrent test2").arg(torrent_relpath).arg(h.name()));
+        const QString &torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath;
+        try {
+          boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData());
+          const QString &sub_hash = misc::toQString(t->info_hash());
+          // Passing the save path along to the sub torrent file
+          TorrentTempData::setSavePath(sub_hash, h.save_path());
+          addTorrent(torrent_fullpath);
+        } catch(std::exception&) {
+          qDebug("Caught error loading torrent");
+          addConsoleMessage(tr("Unable to decode %1 torrent file.").arg(torrent_fullpath), QString::fromUtf8("red"));
+        }
+      }
+    }
+  }
+
   // Read alerts sent by the Bittorrent session
   void Bittorrent::readAlerts() {
     // look at session alerts and display some infos
@@ -1841,18 +1861,21 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
           const bool was_already_seeded = TorrentPersistentData::isSeed(hash);
           if(!was_already_seeded) {
             h.save_resume_data();
+            qDebug("Checking if the torrent contains torrent files to download");
             // Check if there are torrent files inside
             for(int i=0; i<h.get_torrent_info().num_files(); ++i) {
               const QString &torrent_relpath = misc::toQString(h.get_torrent_info().file_at(i).path.string());
               if(torrent_relpath.endsWith(".torrent")) {
-                addConsoleMessage(tr("Recursive download of file %1 embedded in torrent %2", "Recursive download of test.torrent embedded in torrent test2").arg(torrent_relpath).arg(h.name()));
+                qDebug("Found possible recursive torrent download.");
                 const QString &torrent_fullpath = h.save_path()+QDir::separator()+torrent_relpath;
+                qDebug("Full subtorrent path is %s", qPrintable(torrent_fullpath));
                 try {
                   boost::intrusive_ptr<torrent_info> t = new torrent_info(torrent_fullpath.toLocal8Bit().constData());
-                  const QString &sub_hash = misc::toQString(t->info_hash());
-                  // Passing the save path along to the sub torrent file
-                  TorrentTempData::setSavePath(sub_hash, h.save_path());
-                  addTorrent(torrent_fullpath);
+                  if(t->is_valid()) {
+                    qDebug("emitting recursiveTorrentDownloadPossible()");
+                    emit recursiveTorrentDownloadPossible(h);
+                    break;
+                  }
                 } catch(std::exception&) {
                   qDebug("Caught error loading torrent");
                   addConsoleMessage(tr("Unable to decode %1 torrent file.").arg(torrent_fullpath), QString::fromUtf8("red"));
diff --git a/src/bittorrent.h b/src/bittorrent.h
index 206fcb3c8..9f88c5750 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -182,6 +182,7 @@ public slots:
   void downloadFromURLList(const QStringList& urls);
   void configureSession();
   void banIP(QString ip);
+  void recursiveTorrentDownload(const QTorrentHandle &h);
 
 protected:
   QString getSavePath(QString hash, bool fromScanDir = false, QString filePath = QString());
@@ -211,6 +212,7 @@ signals:
   void savePathChanged(QTorrentHandle &h);
   void newConsoleMessage(QString msg);
   void alternativeSpeedsModeChanged(bool alternative);
+  void recursiveTorrentDownloadPossible(QTorrentHandle &h);
 
 private:
   // Bittorrent
diff --git a/src/createtorrent_imp.cpp b/src/createtorrent_imp.cpp
index 8e729863e..67bc8a57a 100644
--- a/src/createtorrent_imp.cpp
+++ b/src/createtorrent_imp.cpp
@@ -85,7 +85,7 @@ void createtorrent::on_addFolder_button_clicked(){
 }
 
 void createtorrent::on_addFile_button_clicked(){
-  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath(), QString(), 0, QFileDialog::ShowDirsOnly);
+  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath());
   if(!file.isEmpty())
     textInputPath->setText(file);
 }