diff --git a/app/components/channel-replybox.jsx b/app/components/channel-replybox.jsx
index 44e5d84..8ea9a26 100644
--- a/app/components/channel-replybox.jsx
+++ b/app/components/channel-replybox.jsx
@@ -209,12 +209,12 @@ export default function ChannelReplybox(props) {
                     disabled={!canMessage}
                     value={text}
                     placeholder='Write something...'
-                    onKeyUp={(e) => {
+                    onKeyDown={(e) => {
                         if (e.key === "Enter") {
-                            e.preventDefault();
                             if (e.shiftKey) {
                                 setRows((v) => Math.min(v + 1, 8));
                             } else {
+                                e.preventDefault();
                                 handleCreateMessage();
                             }
                         }
diff --git a/app/components/community-menu.jsx b/app/components/community-menu.jsx
index 11c8044..cbae2e2 100644
--- a/app/components/community-menu.jsx
+++ b/app/components/community-menu.jsx
@@ -1,6 +1,6 @@
 import { Text, Flex, Box, IconButton, Dialog, Strong, Avatar, Popover, ContextMenu, Button, TextField } from '@radix-ui/themes';
 import { PlusIcon, GearIcon, ChevronDownIcon, ChevronRightIcon } from '@radix-ui/react-icons';
-import { useLoaderData, Link, NavLink, useSubmit } from "@remix-run/react";
+import { useLoaderData, Link, NavLink, useSubmit, PrefetchPageLinks } from "@remix-run/react";
 import * as Collapsible from '@radix-ui/react-collapsible';
 import { useCallback, useState } from 'react';
 import CreateChannelDialog from './create-channel-dialog.jsx';
@@ -86,6 +86,9 @@ function TopChannels(props) {
                     <ConfirmDeleteChannelDialog channel={channel} community={community} closeDialog={() => setDeleteChannelOpen(false)} />
                 </Dialog.Root>
             </>
+            <>
+                {!!channels && channels.map((c) => <PrefetchPageLinks page={`/c/${community.handle}/${c.handle}`} />)}
+            </>
             <Flex direction="column" gap="2" p="0">
                 {!!channels && channels.map((channel) => {
                     const ur = channel.unread_count > 0;
diff --git a/app/components/styles.channel-message.css b/app/components/styles.channel-message.css
index 9fb7690..94a19d1 100644
--- a/app/components/styles.channel-message.css
+++ b/app/components/styles.channel-message.css
@@ -44,6 +44,7 @@
 }
 
 .wk-emojis {
+    z-index: 100;
     border: 1px solid var(--gray-a3);
     background-color: var(--mauve-a3);
     -webkit-backdrop-filter: blur(8px);