diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index a5a558d49..b287bf574 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -377,7 +377,8 @@ class Change_status_message_dialog:
 		self.message_buffer.set_text(self.values[name])
 	
 	def on_change_status_message_dialog_key_press_event(self, widget, event):
-		if event.keyval == gtk.keysyms.Return: # catch CTRL+ENTER
+		if event.keyval == gtk.keysyms.Return or 
+		event.keyval == gtk.keysyms.KP_Enter:  # catch CTRL+ENTER
 			if (event.state & gtk.gdk.CONTROL_MASK):
 				self.window.response(gtk.RESPONSE_OK)
 	
diff --git a/plugins/gtkgui/groupchat_window.py b/plugins/gtkgui/groupchat_window.py
index fa73faf9e..d5634a071 100644
--- a/plugins/gtkgui/groupchat_window.py
+++ b/plugins/gtkgui/groupchat_window.py
@@ -219,7 +219,8 @@ class Groupchat_window(Chat):
 		"""When a key is pressed:
 		if enter is pressed without the shit key, message (if not empty) is sent
 		and printed in the conversation. Tab does autocompete in nickames"""
-		if event.keyval == gtk.keysyms.Return: # ENTER
+		if event.keyval == gtk.keysyms.Return or 
+		event.keyval == gtk.keysyms.KP_Enter: # ENTER
 			if (event.state & gtk.gdk.SHIFT_MASK):
 				return 0
 			message_buffer = widget.get_buffer()
diff --git a/plugins/gtkgui/tabbed_chat_window.py b/plugins/gtkgui/tabbed_chat_window.py
index 15db99549..bf14f7ad6 100644
--- a/plugins/gtkgui/tabbed_chat_window.py
+++ b/plugins/gtkgui/tabbed_chat_window.py
@@ -162,7 +162,8 @@ class Tabbed_chat_window(Chat):
 				self.notebook.emit('key_press_event', event)
 			if event.state & gtk.gdk.SHIFT_MASK: # SHIFT + PAGE UP
 				conversation_textview.emit('key_press_event', event)
-		elif event.keyval == gtk.keysyms.Return:
+		elif event.keyval == gtk.keysyms.Return or
+			event.keyval == gtk.keysyms.KP_Enter: # ENTER
 			if (event.state & gtk.gdk.SHIFT_MASK):
 				return False
 			if self.plugin.connected[self.account] < 2: #we are not connected