diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
index a95359e0eb..e5994a3ae6 100644
--- a/CHANGELOG-Nns-Dapp-unreleased.md
+++ b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -21,6 +21,7 @@ proposal is successful, the changes it released will be moved from this file to
 #### Changed
 
 - Allow `dfinity:` token prefix in QR code for ICP payment.
+- Recover from interrupted canister creation in the frontend.
 
 #### Deprecated
 
diff --git a/frontend/src/lib/pages/NnsWallet.svelte b/frontend/src/lib/pages/NnsWallet.svelte
index 2578b1e990..28069f97ff 100644
--- a/frontend/src/lib/pages/NnsWallet.svelte
+++ b/frontend/src/lib/pages/NnsWallet.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
   import IC_LOGO from "$lib/assets/icp.svg";
+  import type { CanisterDetails } from "$lib/canisters/nns-dapp/nns-dapp.types";
   import HardwareWalletListNeuronsButton from "$lib/components/accounts/HardwareWalletListNeuronsButton.svelte";
   import HardwareWalletShowActionButton from "$lib/components/accounts/HardwareWalletShowActionButton.svelte";
   import LedgerNeuronHotkeyWarning from "$lib/components/accounts/LedgerNeuronHotkeyWarning.svelte";
@@ -28,6 +29,7 @@
   import { createSwapCanisterAccountsStore } from "$lib/derived/sns-swap-canisters-accounts.derived";
   import IcpTransactionModal from "$lib/modals/accounts/IcpTransactionModal.svelte";
   import WalletModals from "$lib/modals/accounts/WalletModals.svelte";
+  import { notifyAndAttachCanisterIfNeeded } from "$lib/services/canisters.services";
   import {
     cancelPollAccounts,
     loadBalance,
@@ -42,6 +44,7 @@
     listNeurons,
   } from "$lib/services/neurons.services";
   import { authStore } from "$lib/stores/auth.store";
+  import { canistersStore } from "$lib/stores/canisters.store";
   import { ENABLE_PERIODIC_FOLLOWING_CONFIRMATION } from "$lib/stores/feature-flags.store";
   import { i18n } from "$lib/stores/i18n";
   import { icpAccountBalancesStore } from "$lib/stores/icp-account-balances.store";
@@ -158,6 +161,35 @@
     neuronAccounts: $neuronAccountsStore,
   });
 
+  const tryNotifyAndAttachCanister = ({
+    account,
+    transactionsStore,
+    canisters,
+  }: {
+    account: Account | undefined;
+    transactionsStore: IcpTransactionsStoreData;
+    canisters: CanisterDetails[] | undefined;
+  }) => {
+    if (
+      isNullish(canisters) ||
+      isNullish(account) ||
+      isNullish(transactionsStore[account.identifier])
+    ) {
+      return;
+    }
+    const transactions = transactionsStore[account.identifier].transactions;
+    notifyAndAttachCanisterIfNeeded({
+      transactions,
+      canisters,
+    });
+  };
+
+  $: tryNotifyAndAttachCanister({
+    account: $selectedAccountStore.account,
+    transactionsStore: $icpTransactionsStore,
+    canisters: $canistersStore?.canisters,
+  });
+
   let uiTransactions: UiTransaction[] | undefined;
   $: uiTransactions = makeUiTransactions({
     account: $selectedAccountStore.account,
diff --git a/frontend/src/tests/lib/pages/NnsWallet.spec.ts b/frontend/src/tests/lib/pages/NnsWallet.spec.ts
index d624cde4f9..bba521f0d2 100644
--- a/frontend/src/tests/lib/pages/NnsWallet.spec.ts
+++ b/frontend/src/tests/lib/pages/NnsWallet.spec.ts
@@ -1,4 +1,5 @@
 import { resetNeuronsApiService } from "$lib/api-services/governance.api-service";
+import * as canistersApi from "$lib/api/canisters.api";
 import * as governanceApi from "$lib/api/governance.api";
 import * as indexApi from "$lib/api/icp-index.api";
 import * as ledgerApi from "$lib/api/icp-ledger.api";
@@ -14,9 +15,11 @@ import { AppPath } from "$lib/constants/routes.constants";
 import { pageStore } from "$lib/derived/page.derived";
 import NnsWallet from "$lib/pages/NnsWallet.svelte";
 import { cancelPollAccounts } from "$lib/services/icp-accounts.services";
+import { canistersStore } from "$lib/stores/canisters.store";
 import { overrideFeatureFlagsStore } from "$lib/stores/feature-flags.store";
 import { icpTransactionsStore } from "$lib/stores/icp-transactions.store";
 import { neuronsStore } from "$lib/stores/neurons.store";
+import { getCanisterCreationCmcAccountIdentifierHex } from "$lib/utils/canisters.utils";
 import { getSwapCanisterAccount } from "$lib/utils/sns.utils";
 import { page } from "$mocks/$app/stores";
 import {
@@ -24,6 +27,7 @@ import {
   resetIdentity,
   setNoIdentity,
 } from "$tests/mocks/auth.store.mock";
+import { mockCanister } from "$tests/mocks/canisters.mock";
 import {
   mockAccountDetails,
   mockAccountsStoreData,
@@ -919,6 +923,93 @@ describe("NnsWallet", () => {
         expect(spyClaimNeuron).toBeCalledTimes(0);
       });
     });
+
+    describe("when there are canister creation transactions", () => {
+      const createCanisterMemo = 0x41455243n;
+      const cmcAccountIdentifierHex =
+        getCanisterCreationCmcAccountIdentifierHex({
+          controller: mockIdentity.getPrincipal(),
+        });
+      const fundingTransaction = createMockSendTransactionWithId({
+        to: cmcAccountIdentifierHex,
+        memo: createCanisterMemo,
+      });
+
+      it("should notify for missing canisters", async () => {
+        vi.spyOn(canistersApi, "notifyAndAttachCanister").mockResolvedValue(
+          undefined
+        );
+        vi.spyOn(indexApi, "getTransactions").mockResolvedValue({
+          transactions: [fundingTransaction],
+          oldestTxId,
+          balance: mainBalanceE8s,
+        });
+
+        canistersStore.setCanisters({
+          certified: true,
+          canisters: [],
+        });
+
+        await renderWallet({
+          accountIdentifier: mockMainAccount.identifier,
+        });
+
+        expect(canistersApi.notifyAndAttachCanister).toBeCalledWith({
+          blockIndex: fundingTransaction.id,
+          identity: mockIdentity,
+        });
+        expect(canistersApi.notifyAndAttachCanister).toBeCalledTimes(1);
+      });
+
+      it("should not notify for present canisters", async () => {
+        vi.spyOn(canistersApi, "notifyAndAttachCanister").mockResolvedValue(
+          undefined
+        );
+        vi.spyOn(indexApi, "getTransactions").mockResolvedValue({
+          transactions: [fundingTransaction],
+          oldestTxId,
+          balance: mainBalanceE8s,
+        });
+
+        canistersStore.setCanisters({
+          certified: true,
+          canisters: [
+            {
+              ...mockCanister,
+              block_index: [fundingTransaction.id],
+            },
+          ],
+        });
+
+        await renderWallet({
+          accountIdentifier: mockMainAccount.identifier,
+        });
+
+        expect(canistersApi.notifyAndAttachCanister).toBeCalledTimes(0);
+      });
+
+      it("should not notify if canisters aren't loaded", async () => {
+        vi.spyOn(canistersApi, "notifyAndAttachCanister").mockResolvedValue(
+          undefined
+        );
+        vi.spyOn(indexApi, "getTransactions").mockResolvedValue({
+          transactions: [fundingTransaction],
+          oldestTxId,
+          balance: mainBalanceE8s,
+        });
+
+        canistersStore.setCanisters({
+          certified: undefined,
+          canisters: undefined,
+        });
+
+        await renderWallet({
+          accountIdentifier: mockMainAccount.identifier,
+        });
+
+        expect(canistersApi.notifyAndAttachCanister).toBeCalledTimes(0);
+      });
+    });
   });
 
   describe("accounts loaded (Subaccount)", () => {