diff --git a/ChannelListWidget.cpp b/ChannelListWidget.cpp
index bedc5dc4cee9fecef8e5f829ea7c81cb5ea08d1e..b4b2c9b844846c4345eb699b52a4f5afa0835a17 100644
--- a/ChannelListWidget.cpp
+++ b/ChannelListWidget.cpp
@@ -25,6 +25,8 @@ void ChannelTree::mousePressEvent(QMouseEvent * event)
 {
 	if (event->button() == Qt::LeftButton)
 		isMouseDown = true;
+	else if (event->button() == Qt::RightButton)
+		m_parent->hide();
 
 	QTreeWidget::mousePressEvent(event);
 }
diff --git a/Release/x64/qtTsOverlay_x64.dll b/Release/x64/qtTsOverlay_x64.dll
index becb1799922790ead8a05b81cbf0acf41568466b..24f1a33bd82ffc0ad3d39af34a606490c544ddfe 100644
Binary files a/Release/x64/qtTsOverlay_x64.dll and b/Release/x64/qtTsOverlay_x64.dll differ
diff --git a/Release/x64/qtTsOverlay_x64.exp b/Release/x64/qtTsOverlay_x64.exp
index 2dfc9f126bdd84a06a0aefd76856f04ac1ad15a6..fd8ef43e55101cea507293993ac91d4351baab05 100644
Binary files a/Release/x64/qtTsOverlay_x64.exp and b/Release/x64/qtTsOverlay_x64.exp differ
diff --git a/Release/x64/qtTsOverlay_x64.lib b/Release/x64/qtTsOverlay_x64.lib
index fa492bf83511d7e8b373e2d228367fbf19fa0364..5ff13126eac8def7af634047c3463d700d72937e 100644
Binary files a/Release/x64/qtTsOverlay_x64.lib and b/Release/x64/qtTsOverlay_x64.lib differ
diff --git a/plugin.cpp b/plugin.cpp
index 97e2c85524da55c990eadee26b8021a00dfd84c6..695e98a78a15cd47b20d2dadcd26595ac18a96ea 100644
--- a/plugin.cpp
+++ b/plugin.cpp
@@ -108,14 +108,12 @@ OverlayController* getController(uint64 serverConnectionHandlerID = 0)
 	{
 		OverlayController* ret = NULL;
 
-		for (auto &it : g_serverList.keys())
+		for (auto it : g_serverList.keys())
 		{
 			int tmp;
-			anyID ownID;
-			ts3Functions.getClientID(it, &ownID);
 
-			if (ts3Functions.getClientSelfVariableAsInt(ownID, CLIENT_IS_MUTED, &tmp) != ERROR_ok)
-				if (tmp == 0)
+			if (ts3Functions.getClientSelfVariableAsInt(it, CLIENT_INPUT_HARDWARE, &tmp) == ERROR_ok)
+				if (tmp == 1)
 					ret = g_serverList.find(it).value();
 		}
 		return ret;
@@ -779,9 +777,11 @@ void ts3plugin_onHotkeyEvent(const char* keyword) {
 
 	if (QString(keyword) == "Channellist")
 	{
-		auto tmp = getController();
-		if (tmp != NULL)
-			tmp->debugPrint("WUHU");
+		auto controller = getController();
+		if (controller != NULL)
+		{
+			controller->displayChannelList();
+		}
 	}
 }
 
diff --git a/plugin.h b/plugin.h
index f6921380fa29472a413d0e3fdd5cb2a9cd925702..ee816d24b5dbb95cfaffafa6248dd8723f41456e 100644
--- a/plugin.h
+++ b/plugin.h
@@ -15,6 +15,8 @@
 #define PLUGINS_EXPORTDLL __attribute__ ((visibility("default")))
 #endif
 
+#define BEEP Beep(512,500);
+
 #ifdef __cplusplus
 extern "C" {
 #endif