diff --git a/src/chat_control.py b/src/chat_control.py
index e5021bde8fb43219b9e62ea9815a659ab8063151..d8a1d6e32f5a38a4e2ef9a3fdbd039ff5abb00fa 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -544,7 +544,8 @@ def _on_message_textview_mykeypress_event(self, widget, event_keyval,
 				else: # ENTER
 					send_message = True
 
-			if gajim.connections[self.account].connected < 2: # we are not connected
+			if gajim.connections[self.account].connected < 2 and send_message:
+				# we are not connected
 				dialogs.ErrorDialog(_('A connection is not available'),
 					_('Your message can not be sent until you are connected.'))
 				send_message = False