diff --git a/client/app/components.d.ts b/client/app/components.d.ts
index 3b3764b..0f9c82c 100644
--- a/client/app/components.d.ts
+++ b/client/app/components.d.ts
@@ -24,7 +24,6 @@ declare module 'vue' {
     PrimeSelectButton: typeof import('primevue/selectbutton')['default']
     PrimeSlider: typeof import('primevue/slider')['default']
     PrimeTag: typeof import('primevue/tag')['default']
-    PrimeTextarea: typeof import('primevue/textarea')['default']
     PrimeToast: typeof import('primevue/toast')['default']
     PrimeToggleSwitch: typeof import('primevue/toggleswitch')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/client/app/composables/use-chat.ts b/client/app/composables/use-chat.ts
index aeb3f2d..a853e39 100644
--- a/client/app/composables/use-chat.ts
+++ b/client/app/composables/use-chat.ts
@@ -39,7 +39,7 @@ export const useChat = createGlobalState(() => {
     socket.on('disconnect', () => {
       messages.value = []
     })
-  }, { immediate: true })
+  }, { immediate: true, flush: 'sync' })
 
   function sendMessage(message: ChatClientMessage) {
     if (!signaling.connected.value)
diff --git a/client/app/pages/index.vue b/client/app/pages/index.vue
index 77826ce..1194fdf 100644
--- a/client/app/pages/index.vue
+++ b/client/app/pages/index.vue
@@ -48,6 +48,7 @@
       <!--      </PrimeInputGroupAddon> -->
 
       <PrimeInputText
+        ref="input"
         v-model="text"
         placeholder="Write a message..."
         fluid
@@ -56,13 +57,14 @@
         @vue:mounted="onInputMounted"
       />
 
-      <PrimeButton class="shrink-0" label="Send" severity="contrast" @click="sendMessage" />
+      <PrimeButton class="shrink-0" label="Send" severity="contrast" :disabled="!text" @click="sendMessage" />
     </PrimeInputGroup>
   </div>
 </template>
 
 <script setup lang="ts">
 import { useEventBus } from '#imports'
+import { onStartTyping, unrefElement, useEventListener } from '@vueuse/core'
 import { format } from 'date-fns'
 import linkifyStr from 'linkify-string'
 import { useChat } from '~/composables/use-chat'
@@ -78,6 +80,7 @@ const eventBus = useEventBus()
 const { messages } = chat
 
 const scrollRef = useTemplateRef('scroll')
+const inputRef = useTemplateRef('input')
 const contentRef = computed(() => scrollRef.value?.$refs.content)
 
 const text = ref('')
@@ -118,6 +121,14 @@ function onInputMounted(ref: VNode) {
   ref.el?.focus()
 }
 
+useEventListener(window, 'focus', async (evt) => {
+  unrefElement(inputRef.value)?.focus()
+})
+
+onStartTyping(() => {
+  unrefElement(inputRef.value)?.focus()
+})
+
 const ARRIVED_STATE_THRESHOLD_PIXELS = 1
 async function onNewMessage() {
   if (!contentRef.value)