diff --git a/conversejs/custom/templates/muc-bottom-panel.js b/conversejs/custom/templates/muc-bottom-panel.js
index 23de86a8..c761598c 100644
--- a/conversejs/custom/templates/muc-bottom-panel.js
+++ b/conversejs/custom/templates/muc-bottom-panel.js
@@ -13,7 +13,7 @@ import tplMucBottomPanel from '../../src/plugins/muc-views/templates/muc-bottom-
 import { CustomElement } from 'shared/components/element.js'
 import 'shared/modals/livechat-external-login.js'
 
-async function setNickname (ev, model) {
+async function setNicknameAndFocus (ev, model) {
   ev.preventDefault()
   const nick = ev.target.nick.value.trim()
   if (!nick) {
@@ -162,7 +162,7 @@ const tplViewerMode = (o) => {
   const i18nExternalLogin = __(LOC_login_using_external_account)
   return html`
     <div class="livechat-viewer-mode-content chatroom-form-container">
-        <form class="converse-form chatroom-form" @submit=${ev => setNickname(ev, model)}>
+        <form class="converse-form chatroom-form" @submit=${ev => setNicknameAndFocus(ev, model)}>
             <label>${i18nHeading}</label>
             <fieldset>
               <input type="text"
diff --git a/conversejs/lib/plugins/livechat-specific/toolbar.ts b/conversejs/lib/plugins/livechat-specific/toolbar.ts
index 7225f21f..32bfeff5 100644
--- a/conversejs/lib/plugins/livechat-specific/toolbar.ts
+++ b/conversejs/lib/plugins/livechat-specific/toolbar.ts
@@ -57,8 +57,8 @@ function getToolbarButtons (this: any, toolbarEl: any, buttons: any[]): any {
 
                 // Hide offline occupants by default
                 const sideBarEl = document.querySelector('converse-muc-sidebar') as unknown as any
-                sideBarEl.model.set('filter_visible', true)
-                sideBarEl.filter.set('type', 'state')
+                sideBarEl?.model.set('filter_visible', true)
+                sideBarEl?.filter.set('type', 'state')
               }}>
               ${icon}
       </button>`