diff --git a/Changelog b/Changelog
index 53c022b06..5cf6147c1 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,7 @@
     - BUGFIX: Preventing GUI from freezing when deleting a download permanently
     - BUGFIX: Fixed directory scanning (stop trying to download the same files several times)
     - BUGFIX: Fixed bad loading of scan dir in option (widgets still disabled)
+    - BUGFIX: Threads are now stopped cleanly before their destruction
     - I18N: Better internationalization thanks to dynamic text support
     - COSMETIC: Replaced OSD messages by Qt4.2 systray messages
 
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 60617972a..196184d7c 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -261,9 +261,11 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
 // Destructor
 GUI::~GUI(){
   qDebug("GUI destruction");
+  searchProcess->kill();
+  searchProcess->waitForFinished();
+  delete searchProcess;
   delete options;
   delete checkConnect;
-  delete searchProcess;
   delete refresher;
   delete myTrayIcon;
   delete myTrayIconMenu;