diff --git a/stylesheets/components/Preferences.scss b/stylesheets/components/Preferences.scss
index 625c26e029..2b12e57c79 100644
--- a/stylesheets/components/Preferences.scss
+++ b/stylesheets/components/Preferences.scss
@@ -1381,7 +1381,9 @@ $secondary-text-color: light-dark(
 
 .Preferences__ChatFolders__ChatSelection__Item--Button,
 .Preferences__ChatFolders__ChatSelection__Item--Clickable {
-  &:hover .Preferences__ChatFolders__ChatSelection__ItemContent {
+  cursor: pointer;
+  &:hover .Preferences__ChatFolders__ChatSelection__ItemContent,
+  .Preferences__ChatFolders__ChatSelection__ItemContent[data-state='open'] {
     background: light-dark(variables.$color-gray-02, variables.$color-gray-80);
   }
 }
@@ -1392,7 +1394,7 @@ $secondary-text-color: light-dark(
   gap: 12px;
   padding-block: 8px;
   padding-inline: 24px;
-  border-radius: 1px;
+  border-radius: 8px;
 
   @include mixins.keyboard-mode {
     .Preferences__ChatFolders__ChatSelection__Item:focus & {
diff --git a/ts/components/preferences/chatFolders/PreferencesChatFolderItems.tsx b/ts/components/preferences/chatFolders/PreferencesChatFolderItems.tsx
index c618cbad84..d5ee7c1623 100644
--- a/ts/components/preferences/chatFolders/PreferencesChatFolderItems.tsx
+++ b/ts/components/preferences/chatFolders/PreferencesChatFolderItems.tsx
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import classNames from 'classnames';
-import React from 'react';
-import type { ReactNode } from 'react';
+import React, { forwardRef } from 'react';
+import type { ForwardedRef, HTMLAttributes, ReactNode } from 'react';
 import { tw } from '../../../axo/tw.js';
 import type { LocalizerType } from '../../../types/I18N.js';
 import { AxoSymbol } from '../../../axo/AxoSymbol.js';
@@ -20,13 +20,20 @@ export const itemClickableClassName =
 export const itemButtonClassName =
   'Preferences__ChatFolders__ChatSelection__Item--Button';
 
-export function ItemContent(props: { children: ReactNode }): JSX.Element {
+export type ItemContentProps = HTMLAttributes<HTMLSpanElement>;
+
+export const ItemContent = forwardRef(function ItemContent(
+  props: ItemContentProps,
+  ref: ForwardedRef<HTMLSpanElement>
+): JSX.Element {
   return (
-    <span className="Preferences__ChatFolders__ChatSelection__ItemContent">
-      {props.children}
-    </span>
+    <span
+      ref={ref}
+      className="Preferences__ChatFolders__ChatSelection__ItemContent"
+      {...props}
+    />
   );
-}
+});
 
 export function ItemAvatar(props: {
   kind: 'Folder' | 'Add' | ChatFolderPresetId;