diff --git a/src/tabs.py b/src/tabs.py
index 68501c7a..bf903310 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -1172,7 +1172,7 @@ class ConversationTab(ChatTab, TabWithInfoWin):
             msg['type'] = 'chat'
             msg['chat_state'] = 'active'
             msg.send()
-        elif self.input.get_text() and empty_before:
+        elif self.input.get_text() and empty_before and not self.input.get_text().startswith('/'):
             msg = self.core.xmpp.make_message(self.get_name())
             msg['type'] = 'chat'
             msg['chat_state'] = 'composing'