diff --git a/src/components/ActionsMenu.vue b/src/components/ActionsMenu.vue
index b8bc9431..abc99ec3 100644
--- a/src/components/ActionsMenu.vue
+++ b/src/components/ActionsMenu.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="actions-menu"
-    :class="{ active: showMenu }"
-    @click="showMenu = true"
-    @keydown="showMenu = true"
-  >
+  <div class="actions-menu" :class="{ active: showMenu }" @click="handleOpen" @keydown="handleOpen">
     <slot name="display" />
     <SmallModal v-if="showMenu" @close="showMenu = false">
       <slot />
@@ -19,11 +14,18 @@ export default {
   components: {
     SmallModal,
   },
+  emits: ['open'],
   data() {
     return {
       showMenu: false,
     };
   },
+  methods: {
+    handleOpen() {
+      if (!this.showMenu) this.$emit('open');
+      this.showMenu = true;
+    },
+  },
 };
 </script>
 
diff --git a/src/components/InputAmount.vue b/src/components/InputAmount.vue
index c4d1d603..625d759a 100644
--- a/src/components/InputAmount.vue
+++ b/src/components/InputAmount.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="input-amount">
     <slot name="left" />
-    <InputField type="number" v-bind="$attrs" @input="$emit('input', $event)" />
+    <InputField
+      type="number"
+      :value="value"
+      v-bind="$attrs"
+      @update:value="$emit('update:value', $event)"
+    />
     <slot name="right" />
   </div>
 </template>
@@ -13,7 +18,10 @@ export default {
   components: {
     InputField,
   },
-  emits: ['input'],
+  props: {
+    value: { type: [String, Number], default: '' },
+  },
+  emits: ['update:value'],
 };
 </script>
 
diff --git a/src/components/MainWrapper.vue b/src/components/MainWrapper.vue
index ea762fee..ea2337a9 100644
--- a/src/components/MainWrapper.vue
+++ b/src/components/MainWrapper.vue
@@ -9,8 +9,8 @@
       <div class="title">
         {{ title }}
       </div>
-      <div class="right" @click="settingsClickHandler" @keydown="settingsClickHandler">
-        <ActionsMenu v-if="settings">
+      <div class="right">
+        <ActionsMenu v-if="settings" @open="settingsClickHandler">
           <template #display>
             <Cog />
           </template>
diff --git a/src/store/index.js b/src/store/index.js
index 87dd516d..037c5f0c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -385,7 +385,17 @@ export default createStore({
         wallet,
         lang,
         aeternity: { providedLiquidity, slippage, deadline },
-        tokens: { userTokens, providers },
+        // Persist only lightweight provider metadata to avoid localStorage overflow.
+        // Do NOT persist large token lists; they are fetched on demand.
+        tokens: {
+          userTokens,
+          providers: (providers || []).map(({ name, icon, active }) => ({
+            name,
+            icon,
+            active,
+            tokens: [],
+          })),
+        },
         hasSeenOnboarding,
       }),
     }),
diff --git a/src/store/modules/tokens.js b/src/store/modules/tokens.js
index ae03db1f..c10d3573 100644
--- a/src/store/modules/tokens.js
+++ b/src/store/modules/tokens.js
@@ -103,6 +103,11 @@ export default {
   actions: {
     async fetchAllTokens({ commit, rootGetters: { activeNetwork }, state: { providers } }) {
       if (activeNetwork) {
+        const existingProvider = providers.find((p) => p.name === 'AE Middleware List');
+        const hasTokensForNetwork = existingProvider?.tokens?.some(
+          (t) => t.networkId === activeNetwork.networkId,
+        );
+        if (hasTokensForNetwork) return;
         const tokens = await fetchAllPages(
           () =>
             fetchJson(`${activeNetwork.middlewareUrl}/v3/aex9?by=name&limit=100&direction=forward`),