diff --git a/src/webpack/common/modals.ts b/src/webpack/common/modals.ts
index 1dbb4a3ed..f9c534a84 100644
--- a/src/webpack/common/modals.ts
+++ b/src/webpack/common/modals.ts
@@ -5,10 +5,10 @@
  */
 
 import * as t from "@vencord/discord-types";
-import { filters, findByCodeLazy, findExportedComponentLazy, mapMangledModuleLazy } from "@webpack";
+import { filters, findByCodeLazy, mapMangledModuleLazy } from "@webpack";
 
-export const Modal: t.Modal = findExportedComponentLazy("Modal");
-export const ConfirmModal: t.ConfirmModal = findExportedComponentLazy("ConfirmModal");
+export const Modal: t.Modal = findByCodeLazy("leadingLayout:", "actions:", ".message");
+export const ConfirmModal: t.ConfirmModal = findByCodeLazy("actionBarInput:", '"critical"', '"secondary');
 
 // Modal key: "Media Viewer Modal"
 export const openMediaModal: (props: t.MediaModalProps) => void = findByCodeLazy("hasMediaOptions", "shouldHideMediaOptions");