diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 6bc0d73ae..a951b62ed 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -128,6 +128,11 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
         ui->_folderList, SLOT(expand(const QModelIndex &)));
 }
 
+void AccountSettings::doExpand()
+{
+    ui->_folderList->expandToDepth(1);
+}
+
 void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
 {
     QTreeView *tv = ui->_folderList;
@@ -148,6 +153,8 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
     menu->setAttribute(Qt::WA_DeleteOnClose);
     connect(menu->addAction(tr("Open folder")), SIGNAL(triggered(bool)),
             this, SLOT(slotOpenCurrentFolder()));
+    connect(menu->addAction(tr("Choose What to Sync")), SIGNAL(triggered(bool)),
+            this, SLOT(doExpand()));
     connect(menu->addAction(folderPaused ? tr("Resume sync") : tr("Pause sync")), SIGNAL(triggered(bool)),
             this, SLOT(slotEnableCurrentFolder()));
     connect(menu->addAction(tr("Remove sync")), SIGNAL(triggered(bool)),
diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h
index c20c464df..b63a75a58 100644
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@ -80,6 +80,7 @@ protected slots:
     void slotDeleteAccount();
     void refreshSelectiveSyncStatus();
     void slotCustomContextMenuRequested(const QPoint&);
+    void doExpand();
 
 private:
     void showConnectionLabel(const QString& message,