diff --git a/src/message_window.py b/src/message_window.py
index 34c9800e8..0cc0d61bd 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -692,6 +692,9 @@ class MessageWindow(object):
 
 		del self.sessionless_ctrls[acct][jid][idx]
 
+		if len(self.sessionless_ctrls[acct][jid]) == 0:
+			del self.sessionless_ctrls[acct][jid]
+
 		if not self._controls.has_key(acct):
 			self._controls[acct] = {}