diff --git a/packages/desktop-client/src/components/common/Menu.tsx b/packages/desktop-client/src/components/common/Menu.tsx
index a948ca5ec4e..68490d7baa2 100644
--- a/packages/desktop-client/src/components/common/Menu.tsx
+++ b/packages/desktop-client/src/components/common/Menu.tsx
@@ -144,7 +144,6 @@ export function Menu<T extends MenuItem>({
           );
         }
 
-        const lastItem = items[idx - 1];
         const Icon = item.icon;
 
         return (
@@ -153,14 +152,9 @@ export function Menu<T extends MenuItem>({
             key={item.name}
             style={{
               cursor: 'default',
-              padding: '9px 10px',
-              marginTop:
-                idx === 0 ||
-                lastItem === Menu.line ||
-                lastItem.type === Menu.label
-                  ? 0
-                  : -3,
+              padding: 10,
               flexDirection: 'row',
+              justifyContent: 'center',
               alignItems: 'center',
               color: theme.menuItemText,
               ...(item.disabled && { color: theme.buttonBareDisabledText }),
diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx
index 9c07af48ff0..e61f6a064ad 100644
--- a/packages/desktop-client/src/components/common/Modal.tsx
+++ b/packages/desktop-client/src/components/common/Modal.tsx
@@ -10,6 +10,7 @@ import { useHotkeysContext } from 'react-hotkeys-hook';
 import ReactModal from 'react-modal';
 
 import { AnimatedLoading } from '../../icons/AnimatedLoading';
+import { SvgLogo } from '../../icons/logo';
 import { SvgDelete } from '../../icons/v0';
 import { type CSSProperties, styles, theme } from '../../style';
 import { tokens } from '../../tokens';
@@ -19,21 +20,16 @@ import { Input } from './Input';
 import { Text } from './Text';
 import { View } from './View';
 
-type ModalChildrenProps = {
-  isEditingTitle: boolean;
-};
-
 export type ModalProps = {
-  title?: string;
+  title?: ReactNode;
   isCurrent?: boolean;
   isHidden?: boolean;
-  children: ReactNode | ((props: ModalChildrenProps) => ReactNode);
+  children: ReactNode | (() => ReactNode);
   size?: { width?: CSSProperties['width']; height?: CSSProperties['height'] };
   padding?: CSSProperties['padding'];
   showHeader?: boolean;
   leftHeaderContent?: ReactNode;
   showTitle?: boolean;
-  editableTitle?: boolean;
   showClose?: boolean;
   showOverlay?: boolean;
   loading?: boolean;
@@ -42,11 +38,9 @@ export type ModalProps = {
   stackIndex?: number;
   parent?: HTMLElement;
   style?: CSSProperties;
-  titleStyle?: CSSProperties;
   contentStyle?: CSSProperties;
   overlayStyle?: CSSProperties;
   onClose?: () => void;
-  onTitleUpdate?: (title: string) => void;
 };
 
 export const Modal = ({
@@ -58,7 +52,6 @@ export const Modal = ({
   showHeader = true,
   leftHeaderContent,
   showTitle = true,
-  editableTitle = false,
   showClose = true,
   showOverlay = true,
   loading = false,
@@ -67,12 +60,10 @@ export const Modal = ({
   stackIndex,
   parent,
   style,
-  titleStyle,
   contentStyle,
   overlayStyle,
   children,
   onClose,
-  onTitleUpdate,
 }: ModalProps) => {
   const { enableScope, disableScope } = useHotkeysContext();
 
@@ -83,20 +74,6 @@ export const Modal = ({
     return () => disableScope(scopeId);
   }, [enableScope, disableScope, scopeId]);
 
-  const [isEditingTitle, setIsEditingTitle] = useState(false);
-  const [_title, setTitle] = useState(title);
-
-  const onTitleClick = () => {
-    setIsEditingTitle(true);
-  };
-
-  const _onTitleUpdate = newTitle => {
-    if (newTitle !== title) {
-      onTitleUpdate?.(newTitle);
-    }
-    setIsEditingTitle(false);
-  };
-
   return (
     <ReactModal
       isOpen={true}
@@ -171,38 +148,26 @@ export const Modal = ({
         {showHeader && (
           <View
             style={{
+              justifyContent: 'center',
+              alignItems: 'center',
               padding: 20,
               position: 'relative',
-              flexShrink: 0,
+              height: 80,
             }}
           >
             <View
               style={{
                 position: 'absolute',
                 left: 0,
-                top: 0,
-                bottom: 0,
-                justifyContent: 'center',
-                alignItems: 'center',
+                margin: '0 5px',
               }}
             >
-              <View
-                style={{
-                  flexDirection: 'row',
-                  marginLeft: 15,
-                }}
-              >
-                {leftHeaderContent && !isEditingTitle
-                  ? leftHeaderContent
-                  : null}
-              </View>
+              {leftHeaderContent}
             </View>
 
             {showTitle && (
               <View
                 style={{
-                  flex: 1,
-                  alignSelf: 'center',
                   textAlign: 'center',
                   // We need to force a width for the text-overflow
                   // ellipses to work because we are aligning center.
@@ -210,37 +175,16 @@ export const Modal = ({
                   width: 'calc(100% - 40px)',
                 }}
               >
-                {isEditingTitle ? (
-                  <Input
-                    style={{
-                      fontSize: 25,
-                      fontWeight: 700,
-                      textAlign: 'center',
-                    }}
-                    value={_title}
-                    onChange={e => setTitle(e.target.value)}
-                    onKeyDown={e => {
-                      if (e.key === 'Enter') {
-                        e.preventDefault();
-                        _onTitleUpdate(e.currentTarget.value);
-                      }
-                    }}
-                    onBlur={e => _onTitleUpdate(e.target.value)}
+                {!title ? (
+                  <SvgLogo
+                    width={30}
+                    height={30}
+                    style={{ justifyContent: 'center', alignSelf: 'center' }}
                   />
+                ) : typeof title === 'string' || typeof title === 'number' ? (
+                  <ModalTitle title={`${title}`} />
                 ) : (
-                  <Text
-                    style={{
-                      fontSize: 25,
-                      fontWeight: 700,
-                      whiteSpace: 'nowrap',
-                      overflow: 'hidden',
-                      textOverflow: 'ellipsis',
-                      ...titleStyle,
-                    }}
-                    {...(editableTitle && { onPointerUp: onTitleClick })}
-                  >
-                    {_title}
-                  </Text>
+                  title
                 )}
               </View>
             )}
@@ -249,36 +193,24 @@ export const Modal = ({
               style={{
                 position: 'absolute',
                 right: 0,
-                top: 0,
-                bottom: 0,
-                justifyContent: 'center',
-                alignItems: 'center',
+                margin: '0 5px',
               }}
             >
-              <View
-                style={{
-                  flexDirection: 'row',
-                  marginRight: 15,
-                }}
-              >
-                {showClose && !isEditingTitle && (
-                  <Button
-                    type="bare"
-                    onClick={onClose}
-                    style={{ padding: '10px 10px' }}
-                    aria-label="Close"
-                  >
-                    <SvgDelete width={10} style={{ color: 'inherit' }} />
-                  </Button>
-                )}
-              </View>
+              {showClose && (
+                <Button
+                  type="bare"
+                  onClick={onClose}
+                  style={{ padding: 10 }}
+                  aria-label="Close"
+                >
+                  <SvgDelete width={10} style={{ color: 'inherit' }} />
+                </Button>
+              )}
             </View>
           </View>
         )}
         <View style={{ padding, paddingTop: 0, flex: 1 }}>
-          {typeof children === 'function'
-            ? children({ isEditingTitle })
-            : children}
+          {typeof children === 'function' ? children() : children}
         </View>
         {loading && (
           <View
@@ -427,3 +359,82 @@ export const ModalButtons = ({
     </View>
   );
 };
+
+type ModalTitleProps = {
+  title: string;
+  isEditable?: boolean;
+  getStyle?: (isEditing: boolean) => CSSProperties;
+  onEdit?: (isEditing: boolean) => void;
+  onTitleUpdate?: (newName: string) => void;
+};
+
+export function ModalTitle({
+  title,
+  isEditable,
+  getStyle,
+  onTitleUpdate,
+}: ModalTitleProps) {
+  const [isEditing, setIsEditing] = useState(false);
+  const style = getStyle?.(isEditing);
+
+  const _onEdit = () => {
+    if (!isEditable) {
+      return;
+    }
+
+    setIsEditing(true);
+  };
+
+  const _onTitleUpdate = newTitle => {
+    if (newTitle !== title) {
+      onTitleUpdate?.(newTitle);
+    }
+    setIsEditing(false);
+  };
+
+  const inputRef = useRef<HTMLInputElement>();
+  useEffect(() => {
+    if (isEditing) {
+      if (inputRef.current) {
+        inputRef.current.scrollLeft = 0;
+      }
+    }
+  }, [isEditing]);
+
+  return isEditing ? (
+    <Input
+      inputRef={inputRef}
+      style={{
+        fontSize: 25,
+        fontWeight: 700,
+        textAlign: 'center',
+        ...style,
+      }}
+      focused={isEditing}
+      defaultValue={title}
+      onUpdate={_onTitleUpdate}
+      onKeyDown={e => {
+        if (e.key === 'Enter') {
+          e.preventDefault();
+          _onTitleUpdate?.(e.currentTarget.value);
+        }
+      }}
+    />
+  ) : (
+    <Text
+      style={{
+        fontSize: 25,
+        fontWeight: 700,
+        textAlign: 'center',
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        ...(isEditable && styles.underlinedText),
+        ...style,
+      }}
+      onClick={_onEdit}
+    >
+      {title}
+    </Text>
+  );
+}
diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
index c6759989192..2ee3920b8fb 100644
--- a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
@@ -10,7 +10,7 @@ import { SvgNotesPaper } from '../../icons/v2';
 import { type CSSProperties, styles, theme } from '../../style';
 import { Button } from '../common/Button';
 import { Menu } from '../common/Menu';
-import { Modal } from '../common/Modal';
+import { Modal, ModalTitle } from '../common/Modal';
 import { View } from '../common/View';
 import { type CommonModalProps } from '../Modals';
 import { Notes } from '../Notes';
@@ -88,8 +88,9 @@ export function AccountMenuModal({
 
   return (
     <Modal
-      title={account.name}
-      titleStyle={styles.underlinedText}
+      title={
+        <ModalTitle isEditable title={account.name} onTitleUpdate={onRename} />
+      }
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -101,8 +102,6 @@ export function AccountMenuModal({
         padding: '0 10px',
         borderRadius: '6px',
       }}
-      editableTitle={true}
-      onTitleUpdate={onRename}
       leftHeaderContent={
         <AdditionalAccountMenu
           account={account}
@@ -111,63 +110,57 @@ export function AccountMenuModal({
         />
       }
     >
-      {({ isEditingTitle }) => (
+      <View
+        style={{
+          flex: 1,
+          flexDirection: 'column',
+        }}
+      >
         <View
           style={{
+            overflowY: 'auto',
             flex: 1,
-            flexDirection: 'column',
           }}
         >
-          <View
-            style={{
-              overflowY: 'auto',
-              flex: 1,
-            }}
-          >
-            <Notes
-              notes={
-                originalNotes && originalNotes.length > 0
-                  ? originalNotes
-                  : 'No notes'
-              }
-              editable={false}
-              focused={false}
-              getStyle={() => ({
-                borderRadius: 6,
-                ...((!originalNotes || originalNotes.length === 0) && {
-                  justifySelf: 'center',
-                  alignSelf: 'center',
-                  color: theme.pageTextSubdued,
-                }),
-              })}
-            />
-          </View>
-          <View
+          <Notes
+            notes={
+              originalNotes && originalNotes.length > 0
+                ? originalNotes
+                : 'No notes'
+            }
+            editable={false}
+            focused={false}
+            getStyle={() => ({
+              borderRadius: 6,
+              ...((!originalNotes || originalNotes.length === 0) && {
+                justifySelf: 'center',
+                alignSelf: 'center',
+                color: theme.pageTextSubdued,
+              }),
+            })}
+          />
+        </View>
+        <View
+          style={{
+            flexDirection: 'row',
+            flexWrap: 'wrap',
+            justifyContent: 'space-between',
+            alignContent: 'space-between',
+            margin: '10px 0',
+          }}
+        >
+          <Button
             style={{
-              flexDirection: 'row',
-              flexWrap: 'wrap',
-              justifyContent: 'space-between',
-              alignContent: 'space-between',
-              margin: '10px 0',
+              ...buttonStyle,
+              display: isEditingTitle ? 'none' : undefined,
             }}
+            onClick={_onEditNotes}
           >
-            <Button
-              style={{
-                ...buttonStyle,
-                display: isEditingTitle ? 'none' : undefined,
-              }}
-              onClick={_onEditNotes}
-            >
-              <SvgNotesPaper
-                width={20}
-                height={20}
-                style={{ paddingRight: 5 }}
-              />
-              Edit notes
-            </Button>
-          </View>
+            <SvgNotesPaper width={20} height={20} style={{ paddingRight: 5 }} />
+            Edit notes
+          </Button>
         </View>
-      )}
+      </View>
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/BudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/BudgetMenuModal.tsx
index 74e31e12343..59a7d867c7e 100644
--- a/packages/desktop-client/src/components/modals/BudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetMenuModal.tsx
@@ -25,7 +25,6 @@ export function BudgetMenuModal({
 
   return (
     <Modal
-      title="Budget actions"
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -37,14 +36,12 @@ export function BudgetMenuModal({
         borderRadius: '6px',
       }}
     >
-      {() => (
-        <BudgetMenu
-          getItemStyle={() => defaultMenuItemStyle}
-          month={month}
-          onToggleHiddenCategories={onToggleHiddenCategories}
-          onSwitchBudgetType={onSwitchBudgetType}
-        />
-      )}
+      <BudgetMenu
+        getItemStyle={() => defaultMenuItemStyle}
+        month={month}
+        onToggleHiddenCategories={onToggleHiddenCategories}
+        onSwitchBudgetType={onSwitchBudgetType}
+      />
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
index c963e668fb8..f3337184994 100644
--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
@@ -11,7 +11,7 @@ import { SvgNotesPaper, SvgViewHide, SvgViewShow } from '../../icons/v2';
 import { type CSSProperties, styles, theme } from '../../style';
 import { Button } from '../common/Button';
 import { Menu } from '../common/Menu';
-import { Modal } from '../common/Modal';
+import { Modal, ModalTitle } from '../common/Modal';
 import { View } from '../common/View';
 import { type CommonModalProps } from '../Modals';
 import { Notes } from '../Notes';
@@ -91,7 +91,9 @@ export function CategoryGroupMenuModal({
 
   return (
     <Modal
-      title={group.name}
+      title={
+        <ModalTitle isEditable title={group.name} onTitleUpdate={onRename} />
+      }
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -103,9 +105,6 @@ export function CategoryGroupMenuModal({
         padding: '0 10px',
         borderRadius: '6px',
       }}
-      editableTitle={true}
-      titleStyle={styles.underlinedText}
-      onTitleUpdate={onRename}
       leftHeaderContent={
         <AdditionalCategoryGroupMenu
           group={group}
@@ -114,72 +113,53 @@ export function CategoryGroupMenuModal({
         />
       }
     >
-      {({ isEditingTitle }) => (
+      <View
+        style={{
+          flex: 1,
+          flexDirection: 'column',
+        }}
+      >
         <View
           style={{
+            overflowY: 'auto',
             flex: 1,
-            flexDirection: 'column',
           }}
         >
-          <View
-            style={{
-              overflowY: 'auto',
-              flex: 1,
-            }}
-          >
-            <Notes
-              notes={notes?.length > 0 ? notes : 'No notes'}
-              editable={false}
-              focused={false}
-              getStyle={() => ({
-                ...styles.mediumText,
-                borderRadius: 6,
-                ...((!notes || notes.length === 0) && {
-                  justifySelf: 'center',
-                  alignSelf: 'center',
-                  color: theme.pageTextSubdued,
-                }),
-              })}
-            />
-          </View>
-          <View
-            style={{
-              flexDirection: 'row',
-              flexWrap: 'wrap',
-              justifyContent: 'space-between',
-              alignContent: 'space-between',
-              paddingTop: 10,
-              paddingBottom: 10,
-            }}
-          >
-            <Button
-              disabled={isEditingTitle}
-              style={{
-                ...buttonStyle,
-                display: isEditingTitle ? 'none' : undefined,
-              }}
-              onClick={_onAddCategory}
-            >
-              <SvgAdd width={17} height={17} style={{ paddingRight: 5 }} />
-              Add category
-            </Button>
-            <Button
-              style={{
-                ...buttonStyle,
-                display: isEditingTitle ? 'none' : undefined,
-              }}
-              onClick={_onEditNotes}
-            >
-              <SvgNotesPaper
-                width={20}
-                height={20}
-                style={{ paddingRight: 5 }}
-              />
-              Edit notes
-            </Button>
-          </View>
+          <Notes
+            notes={notes?.length > 0 ? notes : 'No notes'}
+            editable={false}
+            focused={false}
+            getStyle={() => ({
+              ...styles.mediumText,
+              borderRadius: 6,
+              ...((!notes || notes.length === 0) && {
+                justifySelf: 'center',
+                alignSelf: 'center',
+                color: theme.pageTextSubdued,
+              }),
+            })}
+          />
+        </View>
+        <View
+          style={{
+            flexDirection: 'row',
+            flexWrap: 'wrap',
+            justifyContent: 'space-between',
+            alignContent: 'space-between',
+            paddingTop: 10,
+            paddingBottom: 10,
+          }}
+        >
+          <Button style={buttonStyle} onClick={_onAddCategory}>
+            <SvgAdd width={17} height={17} style={{ paddingRight: 5 }} />
+            Add category
+          </Button>
+          <Button style={buttonStyle} onClick={_onEditNotes}>
+            <SvgNotesPaper width={20} height={20} style={{ paddingRight: 5 }} />
+            Edit notes
+          </Button>
         </View>
-      )}
+      </View>
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index a67c1188957..5f7e31fe8cf 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -11,7 +11,7 @@ import { SvgNotesPaper, SvgViewHide, SvgViewShow } from '../../icons/v2';
 import { type CSSProperties, styles, theme } from '../../style';
 import { Button } from '../common/Button';
 import { Menu } from '../common/Menu';
-import { Modal } from '../common/Modal';
+import { Modal, ModalTitle } from '../common/Modal';
 import { View } from '../common/View';
 import { type CommonModalProps } from '../Modals';
 import { Notes } from '../Notes';
@@ -82,8 +82,9 @@ export function CategoryMenuModal({
 
   return (
     <Modal
-      title={category.name}
-      titleStyle={styles.underlinedText}
+      title={
+        <ModalTitle isEditable title={category.name} onTitleUpdate={onRename} />
+      }
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -95,8 +96,6 @@ export function CategoryMenuModal({
         padding: '0 10px',
         borderRadius: '6px',
       }}
-      editableTitle={true}
-      onTitleUpdate={onRename}
       leftHeaderContent={
         <AdditionalCategoryMenu
           category={category}
@@ -105,59 +104,47 @@ export function CategoryMenuModal({
         />
       }
     >
-      {({ isEditingTitle }) => (
+      <View
+        style={{
+          flex: 1,
+          flexDirection: 'column',
+        }}
+      >
         <View
           style={{
+            overflowY: 'auto',
             flex: 1,
-            flexDirection: 'column',
           }}
         >
-          <View
-            style={{
-              overflowY: 'auto',
-              flex: 1,
-            }}
-          >
-            <Notes
-              notes={originalNotes?.length > 0 ? originalNotes : 'No notes'}
-              editable={false}
-              focused={false}
-              getStyle={() => ({
-                borderRadius: 6,
-                ...((!originalNotes || originalNotes.length === 0) && {
-                  justifySelf: 'center',
-                  alignSelf: 'center',
-                  color: theme.pageTextSubdued,
-                }),
-              })}
-            />
-          </View>
-          <View
-            style={{
-              flexDirection: 'row',
-              flexWrap: 'wrap',
-              justifyContent: 'space-between',
-              alignContent: 'space-between',
-              margin: '10px 0',
-            }}
-          >
-            <Button
-              style={{
-                ...buttonStyle,
-                display: isEditingTitle ? 'none' : undefined,
-              }}
-              onClick={_onEditNotes}
-            >
-              <SvgNotesPaper
-                width={20}
-                height={20}
-                style={{ paddingRight: 5 }}
-              />
-              Edit notes
-            </Button>
-          </View>
+          <Notes
+            notes={originalNotes?.length > 0 ? originalNotes : 'No notes'}
+            editable={false}
+            focused={false}
+            getStyle={() => ({
+              borderRadius: 6,
+              ...((!originalNotes || originalNotes.length === 0) && {
+                justifySelf: 'center',
+                alignSelf: 'center',
+                color: theme.pageTextSubdued,
+              }),
+            })}
+          />
+        </View>
+        <View
+          style={{
+            flexDirection: 'row',
+            flexWrap: 'wrap',
+            justifyContent: 'space-between',
+            alignContent: 'space-between',
+            margin: '10px 0',
+          }}
+        >
+          <Button style={buttonStyle} onClick={_onEditNotes}>
+            <SvgNotesPaper width={20} height={20} style={{ paddingRight: 5 }} />
+            Edit notes
+          </Button>
         </View>
-      )}
+      </View>
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx
index 6c4d5e6e1ea..788d9e19d58 100644
--- a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx
@@ -25,7 +25,6 @@ export function ReportBalanceMenuModal({
 
   return (
     <Modal
-      title="Actions"
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -37,13 +36,11 @@ export function ReportBalanceMenuModal({
         borderRadius: '6px',
       }}
     >
-      {() => (
-        <BalanceMenu
-          categoryId={categoryId}
-          getItemStyle={() => defaultMenuItemStyle}
-          onCarryover={onCarryover}
-        />
-      )}
+      <BalanceMenu
+        categoryId={categoryId}
+        getItemStyle={() => defaultMenuItemStyle}
+        onCarryover={onCarryover}
+      />
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx
index 75c4159103f..247fb0526f4 100644
--- a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx
@@ -27,7 +27,6 @@ export function RolloverBalanceMenuModal({
 
   return (
     <Modal
-      title="Actions"
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -39,15 +38,13 @@ export function RolloverBalanceMenuModal({
         borderRadius: '6px',
       }}
     >
-      {() => (
-        <BalanceMenu
-          categoryId={categoryId}
-          getItemStyle={() => defaultMenuItemStyle}
-          onCarryover={onCarryover}
-          onTransfer={onTransfer}
-          onCover={onCover}
-        />
-      )}
+      <BalanceMenu
+        categoryId={categoryId}
+        getItemStyle={() => defaultMenuItemStyle}
+        onCarryover={onCarryover}
+        onTransfer={onTransfer}
+        onCover={onCover}
+      />
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx
index da62d53d08f..9daa6ac60b1 100644
--- a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx
@@ -26,7 +26,6 @@ export function RolloverToBudgetMenuModal({
 
   return (
     <Modal
-      title="Actions"
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -38,14 +37,12 @@ export function RolloverToBudgetMenuModal({
         borderRadius: '6px',
       }}
     >
-      {() => (
-        <ToBudgetMenu
-          getItemStyle={() => defaultMenuItemStyle}
-          onTransfer={onTransfer}
-          onHoldBuffer={onHoldBuffer}
-          onResetHoldBuffer={onResetHoldBuffer}
-        />
-      )}
+      <ToBudgetMenu
+        getItemStyle={() => defaultMenuItemStyle}
+        onTransfer={onTransfer}
+        onHoldBuffer={onHoldBuffer}
+        onResetHoldBuffer={onResetHoldBuffer}
+      />
     </Modal>
   );
 }
diff --git a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
index cfadec05dab..8a70ceb1572 100644
--- a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
@@ -24,7 +24,6 @@ export function ScheduledTransactionMenuModal({
 
   return (
     <Modal
-      title="Actions"
       showHeader
       focusAfterClose={false}
       {...modalProps}
@@ -36,14 +35,12 @@ export function ScheduledTransactionMenuModal({
         borderRadius: '6px',
       }}
     >
-      {() => (
-        <ScheduledTransactionMenu
-          transactionId={transactionId}
-          onPost={onPost}
-          onSkip={onSkip}
-          getItemStyle={() => defaultMenuItemStyle}
-        />
-      )}
+      <ScheduledTransactionMenu
+        transactionId={transactionId}
+        onPost={onPost}
+        onSkip={onSkip}
+        getItemStyle={() => defaultMenuItemStyle}
+      />
     </Modal>
   );
 }