diff --git a/src/components/SetupErrorDisplay.tsx b/src/components/SetupErrorDisplay.tsx
index a29cc6d..64c253c 100644
--- a/src/components/SetupErrorDisplay.tsx
+++ b/src/components/SetupErrorDisplay.tsx
@@ -186,6 +186,9 @@ export function SetupErrorDisplay(props: { initialError: Error }) {
{i18n.t("error.on_boot.loading_failed.description")}
+
{i18n.t(
"error.on_boot.loading_failed.repair_options"
diff --git a/src/state/megaStore.tsx b/src/state/megaStore.tsx
index 1ede4d8..fcc639f 100644
--- a/src/state/megaStore.tsx
+++ b/src/state/megaStore.tsx
@@ -149,6 +149,16 @@ export const Provider: ParentComponent = (props) => {
throw state.setup_error;
}
+ // If there's already a mutiny wallet in state abort!
+ if (state.mutiny_wallet) {
+ setState({
+ setup_error: new Error(
+ "Existing Mutiny Wallet already running, aborting setup"
+ )
+ });
+ return;
+ }
+
setState({
wallet_loading: true,
load_stage: "checking_double_init"