diff --git a/src/lib/AutoTypeTreeWidget.h b/src/lib/AutoTypeTreeWidget.h
index bf40b93..46361ed 100644
--- a/src/lib/AutoTypeTreeWidget.h
+++ b/src/lib/AutoTypeTreeWidget.h
@@ -18,12 +18,15 @@
 
 
 class AutoTypeTreeWidget : public QTreeWidget {
-Q_OBJECT
-public:
-	AutoTypeTreeWidget(QWidget* parent):QTreeWidget(parent){}
-signals:
-	void returnPressed(QTreeWidgetItem*);
-private:
-	void mouseMoveEvent(QMouseEvent*);
-	void keyPressEvent(QKeyEvent*);
+	Q_OBJECT
+	
+	public:
+		AutoTypeTreeWidget(QWidget* parent):QTreeWidget(parent){};
+	
+	signals:
+		void returnPressed(QTreeWidgetItem*);
+	
+	private:
+		void mouseMoveEvent(QMouseEvent*);
+		void keyPressEvent(QKeyEvent*);
 };
diff --git a/src/main.cpp b/src/main.cpp
index 163be35..2924bae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -118,8 +118,11 @@ int main(int argc, char **argv)
 #ifdef Q_WS_X11
 	{
 		QString OldHomeDir = QDir::homePath()+"/.keepassx";
-		if (args.configLocation().isEmpty() && QFile::exists(OldHomeDir+"/config") && !QFile::exists(HomeDir+"/config"))
+		if (args.configLocation().isEmpty() && QFile::exists(OldHomeDir+"/config") && !QFile::exists(HomeDir+"/config")) {
 			QFile::rename(OldHomeDir+"/config", HomeDir+"/config.ini");
+			if (QDir(OldHomeDir).entryList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden|QDir::System).count()==0)
+				QDir().rmdir(OldHomeDir);
+		}
 	}
 #else
 	if (args.configLocation().isEmpty() && QFile::exists(HomeDir+"/config") && !QFile::exists(HomeDir+"/config.ini"))