diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index ff4683617..d3d1a16b4 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -21,7 +21,6 @@
         "templates/chatroom_nickname_form.html",
         "templates/chatroom_password_form.html",
         "templates/chatroom_sidebar.html",
-        "templates/chatroom_toolbar.html",
         "templates/info.html",
         "templates/list_chatrooms_modal.html",
         "templates/occupant.html",
@@ -49,7 +48,6 @@
     tpl_chatroom_nickname_form,
     tpl_chatroom_password_form,
     tpl_chatroom_sidebar,
-    tpl_chatroom_toolbar,
     tpl_info,
     tpl_list_chatrooms_modal,
     tpl_occupant,
@@ -625,7 +623,7 @@
                 },
 
                 keyPressed (ev) {
-                    if (!this.auto_complete.keyPressed(ev)) {
+                    if (this.auto_complete.keyPressed(ev)) {
                         return;
                     }
                     return _converse.ChatBoxView.prototype.keyPressed.apply(this, arguments);
@@ -727,8 +725,8 @@
                     return _.extend(
                         _converse.ChatBoxView.prototype.getToolbarOptions.apply(this, arguments),
                         {
-                          label_hide_occupants: __('Hide the list of participants'),
-                          show_occupants_toggle: this.is_chatroom && _converse.visible_toolbar_buttons.toggle_occupants
+                          'label_hide_occupants': __('Hide the list of participants'),
+                          'show_occupants_toggle': this.is_chatroom && _converse.visible_toolbar_buttons.toggle_occupants
                         }
                     );
                 },
diff --git a/src/templates/chatroom_toolbar.html b/src/templates/chatroom_toolbar.html
deleted file mode 100644
index 2d5b944c8..000000000
--- a/src/templates/chatroom_toolbar.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{[ if (o.use_emoji)  { ]}
-<li class="toggle-toolbar-menu toggle-smiley dropup">
-    <a class="toggle-smiley fa fa-smile-o" title="{{{o.label_insert_smiley}}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a> 
-    <div class="emoji-picker dropdown-menu toolbar-menu"></div>
-</li>
-{[ } ]}
-{[ if (o.show_call_button)  { ]}
-<li class="toggle-call fa fa-phone" title="{{{o.label_start_call}}}"></li>
-{[ } ]}
-{[ if (o.show_occupants_toggle)  { ]}
-<li class="toggle-occupants fa fa-angle-double-right" title="{{{o.label_hide_occupants}}}"></li>
-{[ } ]}
diff --git a/src/templates/toolbar.html b/src/templates/toolbar.html
index 2051786b7..4074b3c16 100644
--- a/src/templates/toolbar.html
+++ b/src/templates/toolbar.html
@@ -7,3 +7,6 @@
 {[ if (o.show_call_button)  { ]}
 <li class="toggle-call fa fa-phone" title="{{{o.label_start_call}}}"></li>
 {[ } ]}
+{[ if (o.show_occupants_toggle)  { ]}
+<li class="toggle-occupants fa fa-angle-double-right" title="{{{o.label_hide_occupants}}}"></li>
+{[ } ]}