diff --git a/src/listwidget.cpp b/src/listwidget.cpp
index ac9353f..cf97ea5 100644
--- a/src/listwidget.cpp
+++ b/src/listwidget.cpp
@@ -427,15 +427,7 @@ void ListWidget::dropEvent(QDropEvent *event)

 void ListWidget::processFileInfo(const QFileInfo& info)
 {
-	if (info.isDir())
-	{
-		m_model->addDirectory(info.absoluteFilePath());
-	}
-	else
-	{
-		m_model->addFile(info.absoluteFilePath());
-		m_model->loadPlaylist(info.absoluteFilePath());
-	}
+    m_model->add(info.absoluteFilePath());
 }

 const QString ListWidget::getExtraString(int i)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index eef6bd4..b19917f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -276,7 +276,6 @@ void MainWindow::createHotkeys()
 	hotkeysMap.clear();
 	bool ok;
 	QSettings settings("Qmmp-fooUI", "qmmpui");
-	settings.endGroup();
 	settings.beginGroup("/Hotkeys");
 	int hotkeysRowCount = settings.value("/hotkeysRowCount", 0).toInt(&ok);
 	for(int i=0; i<hotkeysRowCount; i++)
@@ -721,7 +720,7 @@ void MainWindow::closePlaylistRequest()
 void MainWindow::addDir()
 {
 	FileDialog::popup(this, FileDialog::AddDirs, &m_lastDir,
-			m_pl_manager->selectedPlayList(), SLOT(addFileList(const QStringList&)),
+			m_pl_manager->selectedPlayList(), SLOT(add(const QStringList&)),
 			tr("Choose a directory"));
 }

@@ -732,7 +731,7 @@ void MainWindow::addFiles()
 		MetaDataManager::instance()->nameFilters().join (" ") +")";
 	filters << MetaDataManager::instance()->filters();
 	FileDialog::popup(this, FileDialog::AddDirsFiles, &m_lastDir,
-			m_pl_manager->selectedPlayList(), SLOT(addFileList(const QStringList&)),
+			m_pl_manager->selectedPlayList(), SLOT(add(const QStringList&)),
 			tr("Select one or more files to open"), filters.join(";;"));
 }