diff --git a/src/main.cpp b/src/main.cpp
index 7bcbdef42..3803e4ce2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -316,17 +316,17 @@ int main(int argc, char *argv[]) {
   signal(SIGSEGV, sigsegvHandler);
 #endif
   // Read torrents given on command line
-  QStringList torrentCmdLine = app.arguments();
-  // Remove first argument (program name)
-  torrentCmdLine.removeFirst();
-#ifndef QT_NO_DEBUG_OUTPUT
-  foreach (const QString &argument, torrentCmdLine) {
-    qDebug() << "Command line argument:" << argument;
+  QStringList torrents;
+  QStringList appArguments = app.arguments();
+  for (int i = 1; i < appArguments.size(); ++i) {
+    if (!appArguments[i].startsWith("--")) {
+      qDebug() << "Command line argument:" << appArguments[i];
+      torrents << appArguments[i];
+    }
   }
-#endif
 
 #ifndef DISABLE_GUI
-  MainWindow window(0, torrentCmdLine);
+  MainWindow window(0, torrents);
   QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
                    &window, SLOT(processParams(const QString&)));
   app.setActivationWindow(&window);
@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) {
 #endif // Q_WS_MAC
 #else
   // Load Headless class
-  HeadlessLoader loader(torrentCmdLine);
+  HeadlessLoader loader(torrents);
   QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
                    &loader, SLOT(processParams(const QString&)));
 #endif
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5e16213b9..43a5383c0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -957,9 +957,6 @@ void MainWindow::processParams(const QStringList& params) {
   const bool useTorrentAdditionDialog = pref.useAdditionDialog();
   foreach (QString param, params) {
     param = param.trimmed();
-    if (param.startsWith("--"))
-      continue;
-
     if (misc::isUrl(param)) {
       QBtSession::instance()->downloadFromUrl(param);
     }else{