diff --git a/ui/src/components/feed/feed-info.tsx b/ui/src/components/feed/feed-info.tsx
index fa7599c..926c21b 100644
--- a/ui/src/components/feed/feed-info.tsx
+++ b/ui/src/components/feed/feed-info.tsx
@@ -42,7 +42,7 @@ export const FeedInfo: Component<FeedInfoProps> = props => {
             tooltip="Mark feed as read"
             class="size-8 rounded-lg text-gray-500 md:size-6 md:rounded-md"
             iconClass="size-5 md:size-4"
-            onClick={() => markFeedAsRead(feed.data!.uuid)}
+            onSelect={() => markFeedAsRead(feed.data!.uuid)}
           />
 
           <FeedMenu
diff --git a/ui/src/components/feed/feed-item.tsx b/ui/src/components/feed/feed-item.tsx
index c32a6b4..28cf309 100644
--- a/ui/src/components/feed/feed-item.tsx
+++ b/ui/src/components/feed/feed-item.tsx
@@ -68,12 +68,12 @@ export const FeedItem: Component<FeedItemProps> = props => {
       <ContextMenu.Item
         label="Mark feed as read"
         icon={HiOutlineCheck}
-        onClick={() => markFeedAsRead(props.feed.uuid)}
+        onSelect={() => markFeedAsRead(props.feed.uuid)}
       />
       <ContextMenu.Item
         label="Refresh feed"
         icon={HiOutlineArrowPath}
-        onClick={() => refreshFeed(props.feed.uuid)}
+        onSelect={() => refreshFeed(props.feed.uuid)}
         iconClass={isRefreshing() && 'animate-spin'}
         disabled={isRefreshing()}
       />
@@ -81,7 +81,7 @@ export const FeedItem: Component<FeedItemProps> = props => {
       <ContextMenu.Item
         label="Move"
         disabled={isRefreshing()}
-        onClick={() => openModal('moveFeed', { feed_uuid: props.feed.uuid })}
+        onSelect={() => openModal('moveFeed', { feed_uuid: props.feed.uuid })}
         icon={HiOutlineFolder}
       />
       <ContextMenu.Item label="Rename" disabled icon={HiOutlinePencilSquare} />
@@ -117,7 +117,7 @@ export const AllFeedsItem = () => {
       <ContextMenu.Item label="Mark all as read" disabled icon={HiOutlineCheck} />
       <ContextMenu.Item
         label="Refresh all feeds"
-        onClick={() => refreshFeeds()}
+        onSelect={() => refreshFeeds()}
         icon={HiOutlineArrowPath}
         iconClass={!!notifications.feedsRefreshing().length && 'animate-spin'}
         disabled={!!notifications.feedsRefreshing().length}
diff --git a/ui/src/components/menus/menu-feed.tsx b/ui/src/components/menus/menu-feed.tsx
index c465392..2095b09 100644
--- a/ui/src/components/menus/menu-feed.tsx
+++ b/ui/src/components/menus/menu-feed.tsx
@@ -2,6 +2,7 @@ import { HiOutlineArrowPath, HiOutlineFolder, HiOutlinePencilSquare, HiOutlineTr
 import { type Component, mergeProps } from 'solid-js';
 import { useNotifications } from '~/contexts/notification-context';
 import { useRefreshFeed } from '~/hooks/queries/use-refresh-feed';
+import { openModal } from '~/stores/modal';
 import { Menu, type MenuProps } from './menu';
 
 type FeedMenuProps = MenuProps & {
@@ -25,13 +26,21 @@ export const FeedMenu: Component<FeedMenuProps> = props => {
     <Menu {...local} size="sm">
       <Menu.Item
         label="Refresh"
-        onClick={() => refreshFeed(props.uuid)}
+        onSelect={() => refreshFeed(props.uuid)}
         icon={HiOutlineArrowPath}
         iconClass={isRefreshing() && 'animate-spin'}
         disabled={isRefreshing()}
       />
 
-      <Menu.Item label="Move" disabled icon={HiOutlineFolder} />
+      <Menu.Item
+        label="Move"
+        onSelect={() => {
+          console.log('clicky');
+          openModal('moveFeed', { feed_uuid: props.uuid });
+        }}
+        icon={HiOutlineFolder}
+        disabled={isRefreshing()}
+      />
       <Menu.Item label="Rename" disabled icon={HiOutlinePencilSquare} />
       <Menu.Item label="Delete" disabled icon={HiOutlineTrash} />
     </Menu>
diff --git a/ui/src/components/nav/nav-row.tsx b/ui/src/components/nav/nav-row.tsx
index 382c3e9..e752dc0 100644
--- a/ui/src/components/nav/nav-row.tsx
+++ b/ui/src/components/nav/nav-row.tsx
@@ -27,7 +27,7 @@ export const NavRow: Component<NavRowProps> = props => {
       <div class="flex flex-1 items-center justify-end">
         <Show when={props.showFeedSwitch}>
           <ActionButton
-            onClick={() => props.setOpen(val => !val)}
+            onSelect={() => props.setOpen(val => !val)}
             class="-m-1"
             tooltip={props.open ? 'Hide feeds' : 'Show feeds'}
             icon={props.open ? HiOutlineXMark : HiOutlineQueueList}
@@ -36,7 +36,7 @@ export const NavRow: Component<NavRowProps> = props => {
 
         <Show when={props.showCloseButton}>
           <ActionButton
-            onClick={() => navigate(state.getFeedUrl())}
+            onSelect={() => navigate(state.getFeedUrl())}
             class="-m-1 ml-auto"
             tooltip="Back to entries"
             icon={HiOutlineXMark}
diff --git a/ui/src/components/panels/list-panel.tsx b/ui/src/components/panels/list-panel.tsx
index 7dc4d6b..abbbcae 100644
--- a/ui/src/components/panels/list-panel.tsx
+++ b/ui/src/components/panels/list-panel.tsx
@@ -115,7 +115,7 @@ export const ListPanel = () => {
                     />
 
                     <IconButton
-                      onClick={() => refreshFeeds()}
+                      onSelect={() => refreshFeeds()}
                       icon={HiOutlineArrowPath}
                       tooltip="Refresh all feeds"
                       class="z-10 size-8 rounded-lg text-gray-500 md:size-6 md:rounded-md"
@@ -138,7 +138,7 @@ export const ListPanel = () => {
                     />
 
                     <IconButton
-                      onClick={() => refreshFeeds()}
+                      onSelect={() => refreshFeeds()}
                       icon={HiOutlineArrowPath}
                       tooltip="Refresh all feeds"
                       class="z-10 size-8 rounded-lg text-gray-500 md:size-6 md:rounded-md"