diff --git a/app/components/DocumentListItem.tsx b/app/components/DocumentListItem.tsx
index d431c3e539..7ac0a0e040 100644
--- a/app/components/DocumentListItem.tsx
+++ b/app/components/DocumentListItem.tsx
@@ -8,11 +8,11 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import EventBoundary from "@shared/components/EventBoundary";
 import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Badge from "~/components/Badge";
 import DocumentMeta from "~/components/DocumentMeta";
-import EventBoundary from "~/components/EventBoundary";
 import Flex from "~/components/Flex";
 import Highlight from "~/components/Highlight";
 import NudeButton from "~/components/NudeButton";
diff --git a/app/components/Sidebar/components/SidebarLink.tsx b/app/components/Sidebar/components/SidebarLink.tsx
index ab716bacf3..ef8258893f 100644
--- a/app/components/Sidebar/components/SidebarLink.tsx
+++ b/app/components/Sidebar/components/SidebarLink.tsx
@@ -2,9 +2,9 @@ import { LocationDescriptor } from "history";
 import * as React from "react";
 import styled, { useTheme, css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import EventBoundary from "@shared/components/EventBoundary";
 import { s } from "@shared/styles";
 import { NavigationNode } from "@shared/types";
-import EventBoundary from "~/components/EventBoundary";
 import EmojiIcon from "~/components/Icons/EmojiIcon";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
diff --git a/app/menus/CommentMenu.tsx b/app/menus/CommentMenu.tsx
index 1dc2c813fc..bbab6aae69 100644
--- a/app/menus/CommentMenu.tsx
+++ b/app/menus/CommentMenu.tsx
@@ -4,13 +4,13 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useMenuState } from "reakit/Menu";
 import { toast } from "sonner";
+import EventBoundary from "@shared/components/EventBoundary";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ContextMenu from "~/components/ContextMenu";
 import MenuItem from "~/components/ContextMenu/MenuItem";
 import OverflowMenuButton from "~/components/ContextMenu/OverflowMenuButton";
 import Separator from "~/components/ContextMenu/Separator";
-import EventBoundary from "~/components/EventBoundary";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import { commentPath, urlify } from "~/utils/routeHelpers";
diff --git a/app/components/EventBoundary.tsx b/shared/components/EventBoundary.tsx
similarity index 100%
rename from app/components/EventBoundary.tsx
rename to shared/components/EventBoundary.tsx
diff --git a/shared/editor/components/ImageZoom.tsx b/shared/editor/components/ImageZoom.tsx
index 2abe38bb2a..ef8e609b3e 100644
--- a/shared/editor/components/ImageZoom.tsx
+++ b/shared/editor/components/ImageZoom.tsx
@@ -1,7 +1,7 @@
 import { transparentize } from "polished";
 import * as React from "react";
 import styled, { createGlobalStyle } from "styled-components";
-import EventBoundary from "~/components/EventBoundary";
+import EventBoundary from "../../components/EventBoundary";
 import { s } from "../../styles";
 import { EditorStyleHelper } from "../styles/EditorStyleHelper";