diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7533acd..646e1bc 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -626,6 +626,8 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
 
 	info(DEBUGMACRO, "scandir() => connect to rsync server to get list of files");
 
+	QGuiApplication::setOverrideCursor(Qt::WaitCursor);
+
 	myProcess = new QProcess(this);
 	myProcess->setProcessChannelMode(QProcess::MergedChannels);
 
@@ -758,6 +760,8 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
 	testRsyncReturn(this, myProcess);
 	myProcess->close();
 	}
+	ui->listWidget->setCursor(Qt::ArrowCursor);
+
 	return false;
 }
 
@@ -1144,13 +1148,17 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
 		if (item->isExpanded() == false)
 		{
 			info(DEBUGMACRO, "Item is not expanded");
-			if (this->rescan)
-			{
+			//if (this->rescan)
+			//{
 				info(DEBUGMACRO, "Re-scanning path: " + this->connexion.service + "/" + path +"/");
 				scanDir(&this->connexion, item,  this->connexion.service + "/" + path +"/");
 				item->setExpanded(true);
-			}
+			//}
+		}else
+		{
+			item->setExpanded(false);
 		}
+
 	}
 
 	if (config.autosaveCheckbox->checkState() == Qt::Checked)