diff --git a/ChangeLog b/ChangeLog
index de43e3b9..3c057811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 3.3.2
 
-- the connection setup dialog can now be opened during a connection
+
+TODO: This feature is disabled for now since it does not work as expected (we
+      get audio drop outs if the list is open during a connection) 
+DISABLED: - the connection setup dialog can now be opened during a connection
 
 
 
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index 63e91258..ec963848 100755
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -324,8 +324,17 @@ CClientDlg::CClientDlg ( CClient*        pNCliP,
     // View menu  --------------------------------------------------------------
     pViewMenu = new QMenu ( "&View", this );
 
+
+// TODO This View menu item is disabled for now. The reason for that is that if
+// if the connection setup dialog is opened during an active connection, we will
+// get audio drop outs everytime the ping times in the list are updated which is
+// not acceptable.
+// Fix the issue with the thread priorities and enable the menu item again...
+/*
     pViewMenu->addAction ( tr ( "&Connection Setup..." ), this,
         SLOT ( OnOpenConnectionSetupDialog() ) );
+*/
+
 
     pViewMenu->addAction ( tr ( "C&hat..." ), this,
         SLOT ( OnOpenChatDialog() ) );