diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 4564d7769d..6bc0d73ae1 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -121,6 +121,11 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
             this, SLOT(slotUpdateQuota(qint64,qint64)));
 
     connect(ui->deleteButton, SIGNAL(clicked()) , this, SLOT(slotDeleteAccount()));
+
+    // Expand already on single click
+    ui->_folderList->setExpandsOnDoubleClick(false);
+    QObject::connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
+        ui->_folderList, SLOT(expand(const QModelIndex &)));
 }
 
 void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)