diff --git a/clientapp/pages/groupchat.js b/clientapp/pages/groupchat.js
index 01db6a0..b2f82b3 100644
--- a/clientapp/pages/groupchat.js
+++ b/clientapp/pages/groupchat.js
@@ -135,7 +135,7 @@ module.exports = BasePage.extend({
             if (this.$autoComplete.css('display') != 'none') {
                 var nickname = this.$autoComplete.find(">:nth-child(" + this.autoCompletePos + ")>:first-child").text();
                 this.rosterItemSelected(nickname);
-            } else {
+            } else if (e.which === 13){
                 app.composing[this.model.jid] = '';
                 this.sendChat();
             }