diff --git a/Changelog b/Changelog
index 9b28dc135..180277810 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
     - BUGFIX: Fixed possible crash when deleting a torrent permanently
     - BUGFIX: Queued_for_checking torrents were not displayed as checking in seeding list
+    - BUGFIX: Speed up startup time when having a lot of torrents
 
 * Wed Oct 29th 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
     - FEATURE: Torrent queueing system (with priorities)
diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp
index 5717061a8..99b689f15 100644
--- a/src/FinishedTorrents.cpp
+++ b/src/FinishedTorrents.cpp
@@ -139,7 +139,6 @@ void FinishedTorrents::addTorrent(QString hash){
   // Update the number of finished torrents
   ++nbFinished;
   emit finishedTorrentsNumberChanged(nbFinished);
-  sortFinishedList();
 }
 
 void FinishedTorrents::torrentAdded(QTorrentHandle& h) {
diff --git a/src/FinishedTorrents.h b/src/FinishedTorrents.h
index fe3aaec75..cb6f7e6af 100644
--- a/src/FinishedTorrents.h
+++ b/src/FinishedTorrents.h
@@ -60,7 +60,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
-    void loadLastSortedColumn();
     void toggleFinishedListSortOrder(int index);
     void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
     void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
@@ -85,6 +84,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
     void hidePriorityColumn(bool hide);
+    void loadLastSortedColumn();
 
   signals:
     void torrentMovedFromFinishedList(QString);
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 6c4c835a6..d9cc7d57d 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -166,6 +166,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   configureSession(true);
   // Resume unfinished torrents
   BTSession->resumeUnfinishedTorrents();
+  downloadingTorrentTab->loadLastSortedColumn();
+  finishedTorrentTab->loadLastSortedColumn();
   // Add torrent given on command line
   processParams(torrentCmdLine);
   // Initialize Web UI
diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp
index 2e7d2ebf8..d22d66e44 100644
--- a/src/downloadingTorrents.cpp
+++ b/src/downloadingTorrents.cpp
@@ -628,7 +628,6 @@ void DownloadingTorrents::addTorrent(QString hash) {
   }
   ++nbTorrents;
   emit unfinishedTorrentsNumberChanged(nbTorrents);
-  sortDownloadList();
 }
 
 void DownloadingTorrents::sortDownloadListFloat(int index, Qt::SortOrder sortOrder) {
@@ -784,7 +783,6 @@ bool DownloadingTorrents::loadColWidthDLList() {
   for(unsigned int i=0; i<listSize; ++i) {
         downloadList->header()->resizeSection(i, width_list.at(i).toInt());
   }
-  loadLastSortedColumn();
   qDebug("Download list columns width loaded");
   return true;
 }
@@ -834,7 +832,6 @@ void DownloadingTorrents::torrentAdded(QTorrentHandle& h) {
   }
   ++nbTorrents;
   emit unfinishedTorrentsNumberChanged(nbTorrents);
-  sortDownloadList();
 }
 
 void DownloadingTorrents::updateFileSizeAndProgress(QString hash) {
diff --git a/src/downloadingTorrents.h b/src/downloadingTorrents.h
index 4c22164b1..83613ae61 100644
--- a/src/downloadingTorrents.h
+++ b/src/downloadingTorrents.h
@@ -84,7 +84,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void hideOrShowColumnRatio();
     void hideOrShowColumnEta();
     void hideOrShowColumnPriority();
-    void loadLastSortedColumn();
 
   public slots:
     void updateDlList();
@@ -96,6 +95,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void showPropertiesFromHash(QString hash);
     void hidePriorityColumn(bool hide);
     void sortProgressColumn(QString hash);
+    void loadLastSortedColumn();
 
 };