diff --git a/TODO b/TODO
index 0c8dd35..101dd11 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1 @@
-1. When clicking message balloon, the corresponding ChatDialog is raised.
-2. Fix mulitple occurance problem.
-3. Add the trust spanning tree.
\ No newline at end of file
+1. Fix mulitple nick occurance problem.
\ No newline at end of file
diff --git a/src/controller.cpp b/src/controller.cpp
index 9904a64..646dfc1 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -484,7 +484,7 @@
 
   QAction* chatAction = new QAction(chatroomName, this);
   m_chatActionList[chatroomName.toStdString()] = chatAction;
-  connect(chatAction, SIGNAL(triggered()), chatDialog, SLOT(showNormal()));
+  connect(chatAction, SIGNAL(triggered()), chatDialog, SLOT(raise()));
 
   QAction* closeAction = new QAction(chatroomName, this);
   m_closeActionList[chatroomName.toStdString()] = closeAction;