diff --git a/web/src/ui/timeline/menu/ConfirmWithMessageModal.tsx b/web/src/ui/menu/ConfirmWithMessageModal.tsx
similarity index 95%
rename from web/src/ui/timeline/menu/ConfirmWithMessageModal.tsx
rename to web/src/ui/menu/ConfirmWithMessageModal.tsx
index 05d11e1..4d44084 100644
--- a/web/src/ui/timeline/menu/ConfirmWithMessageModal.tsx
+++ b/web/src/ui/menu/ConfirmWithMessageModal.tsx
@@ -16,8 +16,8 @@
 import React, { JSX, use, useState } from "react"
 import { MemDBEvent } from "@/api/types"
 import { isMobileDevice } from "@/util/ismobile.ts"
-import { ModalCloseContext } from "../../modal"
-import TimelineEvent from "../TimelineEvent.tsx"
+import { ModalCloseContext } from "../modal"
+import TimelineEvent from "../timeline/TimelineEvent.tsx"
 
 interface ConfirmWithMessageProps {
 	evt?: MemDBEvent
diff --git a/web/src/ui/timeline/menu/EventMenu.tsx b/web/src/ui/menu/EventMenu.tsx
similarity index 95%
rename from web/src/ui/timeline/menu/EventMenu.tsx
rename to web/src/ui/menu/EventMenu.tsx
index d0c7a74..afa4f54 100644
--- a/web/src/ui/timeline/menu/EventMenu.tsx
+++ b/web/src/ui/menu/EventMenu.tsx
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 import { CSSProperties, use } from "react"
 import { MemDBEvent } from "@/api/types"
-import ClientContext from "../../ClientContext.ts"
-import { RoomContextData } from "../../roomview/roomcontext.ts"
+import ClientContext from "../ClientContext.ts"
+import { RoomContextData } from "../roomview/roomcontext.ts"
 import { usePrimaryItems } from "./usePrimaryItems.tsx"
 import { useSecondaryItems } from "./useSecondaryItems.tsx"
 import CloseIcon from "@/icons/close.svg?react"
diff --git a/web/src/ui/timeline/menu/RoomMenu.css b/web/src/ui/menu/RoomMenu.css
similarity index 100%
rename from web/src/ui/timeline/menu/RoomMenu.css
rename to web/src/ui/menu/RoomMenu.css
diff --git a/web/src/ui/timeline/menu/RoomMenu.tsx b/web/src/ui/menu/RoomMenu.tsx
similarity index 94%
rename from web/src/ui/timeline/menu/RoomMenu.tsx
rename to web/src/ui/menu/RoomMenu.tsx
index 46cad47..6adb172 100644
--- a/web/src/ui/timeline/menu/RoomMenu.tsx
+++ b/web/src/ui/menu/RoomMenu.tsx
@@ -16,9 +16,9 @@
 import { CSSProperties, use } from "react"
 import { RoomListEntry, RoomStateStore, useAccountData } from "@/api/statestore"
 import { RoomID } from "@/api/types"
-import ClientContext from "../../ClientContext.ts"
-import { ModalContext } from "../../modal"
-import SettingsView from "../../settings/SettingsView.tsx"
+import ClientContext from "../ClientContext.ts"
+import { ModalContext } from "../modal"
+import SettingsView from "../settings/SettingsView.tsx"
 import NotificationsOffIcon from "@/icons/notifications-off.svg?react"
 import NotificationsIcon from "@/icons/notifications.svg?react"
 import SettingsIcon from "@/icons/settings.svg?react"
diff --git a/web/src/ui/timeline/menu/ShareModal.tsx b/web/src/ui/menu/ShareModal.tsx
similarity index 100%
rename from web/src/ui/timeline/menu/ShareModal.tsx
rename to web/src/ui/menu/ShareModal.tsx
diff --git a/web/src/ui/timeline/menu/index.css b/web/src/ui/menu/index.css
similarity index 100%
rename from web/src/ui/timeline/menu/index.css
rename to web/src/ui/menu/index.css
diff --git a/web/src/ui/timeline/menu/index.ts b/web/src/ui/menu/index.ts
similarity index 100%
rename from web/src/ui/timeline/menu/index.ts
rename to web/src/ui/menu/index.ts
diff --git a/web/src/ui/timeline/menu/usePrimaryItems.tsx b/web/src/ui/menu/usePrimaryItems.tsx
similarity index 96%
rename from web/src/ui/timeline/menu/usePrimaryItems.tsx
rename to web/src/ui/menu/usePrimaryItems.tsx
index 8193fd3..a9974e2 100644
--- a/web/src/ui/timeline/menu/usePrimaryItems.tsx
+++ b/web/src/ui/menu/usePrimaryItems.tsx
@@ -18,9 +18,9 @@ import Client from "@/api/client.ts"
 import { MemDBEvent } from "@/api/types"
 import { emojiToReactionContent } from "@/util/emoji"
 import { useEventAsState } from "@/util/eventdispatcher.ts"
-import EmojiPicker from "../../emojipicker/EmojiPicker.tsx"
-import { ModalCloseContext, ModalContext } from "../../modal"
-import { RoomContextData } from "../../roomview/roomcontext.ts"
+import EmojiPicker from "../emojipicker/EmojiPicker.tsx"
+import { ModalCloseContext, ModalContext } from "../modal"
+import { RoomContextData } from "../roomview/roomcontext.ts"
 import { EventExtraMenu } from "./EventMenu.tsx"
 import { getEncryption, getModalStyleFromButton, getPending, getPowerLevels } from "./util.ts"
 import EditIcon from "@/icons/edit.svg?react"
diff --git a/web/src/ui/timeline/menu/useSecondaryItems.tsx b/web/src/ui/menu/useSecondaryItems.tsx
similarity index 97%
rename from web/src/ui/timeline/menu/useSecondaryItems.tsx
rename to web/src/ui/menu/useSecondaryItems.tsx
index 5c9ea15..76ecb4d 100644
--- a/web/src/ui/timeline/menu/useSecondaryItems.tsx
+++ b/web/src/ui/menu/useSecondaryItems.tsx
@@ -17,9 +17,9 @@ import { use } from "react"
 import Client from "@/api/client.ts"
 import { useRoomState } from "@/api/statestore"
 import { MemDBEvent } from "@/api/types"
-import { ModalCloseContext, ModalContext } from "../../modal"
-import { RoomContext, RoomContextData } from "../../roomview/roomcontext.ts"
-import JSONView from "../../util/JSONView.tsx"
+import { ModalCloseContext, ModalContext } from "../modal"
+import { RoomContext, RoomContextData } from "../roomview/roomcontext.ts"
+import JSONView from "../util/JSONView.tsx"
 import ConfirmWithMessageModal from "./ConfirmWithMessageModal.tsx"
 import ShareModal from "./ShareModal.tsx"
 import { getPending, getPowerLevels } from "./util.ts"
diff --git a/web/src/ui/timeline/menu/util.ts b/web/src/ui/menu/util.ts
similarity index 100%
rename from web/src/ui/timeline/menu/util.ts
rename to web/src/ui/menu/util.ts
diff --git a/web/src/ui/rightpanel/UserModeration.tsx b/web/src/ui/rightpanel/UserModeration.tsx
index c7a7d0a..3f2d586 100644
--- a/web/src/ui/rightpanel/UserModeration.tsx
+++ b/web/src/ui/rightpanel/UserModeration.tsx
@@ -17,9 +17,9 @@ import { use } from "react"
 import Client from "@/api/client.ts"
 import { RoomStateStore } from "@/api/statestore"
 import { MemDBEvent, MembershipAction } from "@/api/types"
+import ConfirmWithMessageModal from "../menu/ConfirmWithMessageModal.tsx"
+import { getPowerLevels } from "../menu/util.ts"
 import { ModalContext } from "../modal"
-import ConfirmWithMessageModal from "../timeline/menu/ConfirmWithMessageModal.tsx"
-import { getPowerLevels } from "../timeline/menu/util.ts"
 import StartDMButton from "./StartDMButton.tsx"
 import UserIgnoreButton from "./UserIgnoreButton.tsx"
 import BanIcon from "@/icons/gavel.svg?react"
diff --git a/web/src/ui/roomlist/Entry.tsx b/web/src/ui/roomlist/Entry.tsx
index c456bc3..6e4c7f4 100644
--- a/web/src/ui/roomlist/Entry.tsx
+++ b/web/src/ui/roomlist/Entry.tsx
@@ -21,8 +21,8 @@ import useContentVisibility from "@/util/contentvisibility.ts"
 import { getDisplayname } from "@/util/validation.ts"
 import ClientContext from "../ClientContext.ts"
 import MainScreenContext from "../MainScreenContext.ts"
+import { RoomMenu, getModalStyleFromMouse } from "../menu"
 import { ModalContext } from "../modal"
-import { RoomMenu, getModalStyleFromMouse } from "../timeline/menu"
 import UnreadCount from "./UnreadCount.tsx"
 
 export interface RoomListEntryProps {
diff --git a/web/src/ui/timeline/TimelineEvent.tsx b/web/src/ui/timeline/TimelineEvent.tsx
index b78cc06..2f0a4fa 100644
--- a/web/src/ui/timeline/TimelineEvent.tsx
+++ b/web/src/ui/timeline/TimelineEvent.tsx
@@ -22,6 +22,7 @@ import { isMobileDevice } from "@/util/ismobile.ts"
 import { getDisplayname, isEventID } from "@/util/validation.ts"
 import ClientContext from "../ClientContext.ts"
 import MainScreenContext from "../MainScreenContext.ts"
+import { EventFixedMenu, EventFullMenu, EventHoverMenu, getModalStyleFromMouse } from "../menu"
 import { ModalContext, NestableModalContext } from "../modal"
 import { useRoomContext } from "../roomview/roomcontext.ts"
 import EventEditHistory from "./EventEditHistory.tsx"
@@ -29,7 +30,6 @@ import ReadReceipts from "./ReadReceipts.tsx"
 import { ReplyIDBody } from "./ReplyBody.tsx"
 import URLPreviews from "./URLPreviews.tsx"
 import { ContentErrorBoundary, HiddenEvent, getBodyType, getPerMessageProfile, isSmallEvent } from "./content"
-import { EventFixedMenu, EventFullMenu, EventHoverMenu, getModalStyleFromMouse } from "./menu"
 import ErrorIcon from "@/icons/error.svg?react"
 import PendingIcon from "@/icons/pending.svg?react"
 import SentIcon from "@/icons/sent.svg?react"