diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py
index 325fa7f6..51f24f97 100644
--- a/sugar/chat/Chat.py
+++ b/sugar/chat/Chat.py
@@ -64,6 +64,16 @@ class Chat(gtk.VBox):
 		self.pack_start(self._editor, False)
 		self._editor.show()
 
+		self.connect("key-press-event", self.__key_press_event_cb)
+
+	def __key_press_event_cb(self, window, event):
+		if event.keyval == gtk.keysyms.s and \
+		   event.state & gtk.gdk.CONTROL_MASK:
+			if self.get_mode() == Chat.SKETCH_MODE:
+				self.set_mode(Chat.TEXT_MODE)
+			elif self.get_mode() == Chat.TEXT_MODE:
+				self.set_mode(Chat.SKETCH_MODE)
+
 	def get_mode(self):
 		return self._mode
 
diff --git a/sugar/chat/ChatWindow.py b/sugar/chat/ChatWindow.py
index 59cb02c7..b06175d9 100644
--- a/sugar/chat/ChatWindow.py
+++ b/sugar/chat/ChatWindow.py
@@ -8,7 +8,6 @@ class ChatWindow(gtk.Window):
 	def __init__(self):
 		gtk.Window.__init__(self)
 		self._chat = None
-		self.connect("key-press-event", self.__key_press_event_cb)
 	
 	def set_chat(self, chat):
 		if self._chat != None:
@@ -17,12 +16,3 @@ class ChatWindow(gtk.Window):
 		self._chat = chat
 		self.add(self._chat)
 		self._chat.show()
-
-	def __key_press_event_cb(self, window, event):
-		if event.keyval == gtk.keysyms.s and \
-		   event.state & gtk.gdk.CONTROL_MASK:
-			if self._chat.get_mode() == Chat.SKETCH_MODE:
-				self._chat.set_mode(Chat.TEXT_MODE)
-			elif self._chat.get_mode() == Chat.TEXT_MODE:
-				self._chat.set_mode(Chat.SKETCH_MODE)			
-