diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp
index 5a7919350..816efd50e 100644
--- a/src/mumble/ConnectDialog.cpp
+++ b/src/mumble/ConnectDialog.cpp
@@ -166,13 +166,16 @@ void ConnectDialog::initList() {
 void ConnectDialog::fillList() {
 	qtwServers->clear();
 
+	QList<QTreeWidgetItem *> ql;
+
 	foreach(PublicInfo pi, qlPublicServers) {
 		QStringList qsl;
 		qsl << pi.name;
 		qsl << QString::fromLatin1("%1:%2").arg(pi.ip).arg(pi.port);
 		qsl << pi.url.toString();
-		new TextSortedItem(qtwServers,qsl);
+		ql << new TextSortedItem(NULL,qsl);
 	}
+	qtwServers->addTopLevelItems(ql);
 }
 
 void ConnectDialog::on_qpbURL_clicked() {
diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp
index ad8ae47d9..5b0d6af5f 100644
--- a/src/mumble/GlobalShortcut.cpp
+++ b/src/mumble/GlobalShortcut.cpp
@@ -105,6 +105,7 @@ void ShortcutKeyWidget::displayKeys() {
 }
 
 GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) {
+	setObjectName(QLatin1String("GlobalShortcutConfig"));
 	QGroupBox *qgbShortcuts = new QGroupBox(tr("Shortcuts"));
 	QLabel *lab;