diff --git a/shared/js/ui/react-elements/modal/internal/index.tsx b/shared/js/ui/react-elements/modal/internal/index.tsx
index 4b0b5925..4f8a0a15 100644
--- a/shared/js/ui/react-elements/modal/internal/index.tsx
+++ b/shared/js/ui/react-elements/modal/internal/index.tsx
@@ -18,6 +18,7 @@ import {LogCategory, logError} from "tc-shared/log";
 import {Registry} from "tc-events";
 import {guid} from "tc-shared/crypto/uid";
 import {ErrorBoundary} from "tc-shared/ui/react-elements/ErrorBoundary";
+import ReactDOM from "react-dom";
 
 class InternalRendererInstance extends React.PureComponent<{
     instance: InternalModalInstance,
@@ -250,6 +251,15 @@ class InternalModalHookInner extends React.PureComponent<{}, {
     }
 }
 
+/*
 export const InternalModalHook = React.memo(() => (
     <InternalModalHookInner ref={internalModalContainer} />
-));
\ No newline at end of file
+));
+*/
+export const InternalModalHook = React.memo(() => {
+    /* FIXME: This is only a temporary solution but if we don't do like this we'll mess up stacking of modals! */
+    return ReactDOM.createPortal(
+        <InternalModalHookInner ref={internalModalContainer} />,
+        document.body
+    );
+});
\ No newline at end of file