diff --git a/frontend/src/components/MessageInput.svelte b/frontend/src/components/MessageInput.svelte
index cfbda7f..e03bb7a 100644
--- a/frontend/src/components/MessageInput.svelte
+++ b/frontend/src/components/MessageInput.svelte
@@ -1,8 +1,9 @@
 <script>
+    import { onDestroy, onMount } from "svelte";
     import { ArrowUpIcon } from "svelte-feather-icons";
     import request from "../request";
     import { apiRoute, getItem } from "../storage";
-    import { messagesStoreProvider, overlayStore, smallViewport, typingStore, userInfoStore } from "../stores";
+    import { messagesStoreProvider, overlayStore, selectedChannel, smallViewport, typingStore, userInfoStore } from "../stores";
 
     export let channel;
     let messageInput = "";
@@ -90,6 +91,11 @@
     const onInput = () => {
         typingStore.didInputKey();
     };
+
+    // Focus the text area when the component first loads, or when the user selects another channel
+    const focusTextarea = () => messageTextarea && messageTextarea.focus();
+    onMount(focusTextarea);
+    onDestroy(selectedChannel.subscribe(focusTextarea));
 </script>
 
 <style>