diff --git a/src/GUI.cpp b/src/GUI.cpp
index 47b6d29cf..c7b703333 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -199,6 +199,9 @@ GUI::~GUI() {
   // Async deletion of Bittorrent session as early as possible
   // in order to speed up exit
   session_proxy sp = BTSession->asyncDeletion();
+  // Some saving
+  properties->saveSettings();
+  disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
   // Delete other GUI objects
   delete status_bar;
   delete transferList;
diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp
index b724bcafb..79498882f 100644
--- a/src/propertieswidget.cpp
+++ b/src/propertieswidget.cpp
@@ -118,7 +118,6 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, GUI* main_window, TransferLi
 }
 
 PropertiesWidget::~PropertiesWidget() {
-  saveSettings();
   delete refreshTimer;
   delete trackerList;
   delete peersList;