diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 3abb78b1b8..f6a96b268d 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -109,6 +109,8 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
     connect(syncNowAction, SIGNAL(triggered()), SLOT(slotSyncCurrentFolderNow()));
     addAction(syncNowAction);
 
+    // Expand already on single click
+    ui->_folderList->setExpandsOnDoubleClick(false);
     connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
             this, SLOT(slotFolderListClicked(const QModelIndex&)));
 
@@ -150,11 +152,6 @@ void AccountSettings::createAccountToolbox()
     ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
     ui->_accountToolbox->setMenu(menu);
     ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);
-
-    // Expand already on single click
-    ui->_folderList->setExpandsOnDoubleClick(false);
-    QObject::connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
-                     this, SLOT(slotFolderListClicked(const QModelIndex&)));
 }
 
 void AccountSettings::slotOpenAccountWizard()