diff --git a/static/gui/app-store/002.html b/static/gui/app-store/002.html
index 408a4aa18..e17eff597 100755
--- a/static/gui/app-store/002.html
+++ b/static/gui/app-store/002.html
@@ -57,8 +57,8 @@
                         </article>
                 </a>
 
-                <a class="app-card-link app-card-link--inactive" href="#" aria-disabled="true">
-                        <article class="app-card app-card--disabled" data-app-id="999-999">
+                <a class="app-card-link" href="#">
+                        <article class="app-card" data-app-id="999-999">
                                 <div class="app-card__icon-wrapper">
                                         <img class="app-card__icon" src="apps/999-999/logo.png" alt="Add new app" style="opacity: 0.4; filter: drop-shadow(2px 4px 1px black) invert(0.5);">
                                 </div>
diff --git a/static/gui/app-store/002b.html b/static/gui/app-store/002b.html
index 99de18eb0..9569a925f 100755
--- a/static/gui/app-store/002b.html
+++ b/static/gui/app-store/002b.html
@@ -41,11 +41,34 @@
         <div id="apps-container" class="apps-container app-store-grid"></div>
 
         <script>
-function toggleAppInstallation(appId) {
-    if (appId === '999-999') return;
-    const appInstalled = localStorage.getItem(appId) === 'added';
-    localStorage.setItem(appId, appInstalled ? '' : 'added' );
-    // Removed updateHomeScreen() call here, as window.addEventListener('storage') will handle it
+const ADD_APP_ID = '999-999';
+
+function isAddAppAlwaysVisible() {
+    return window.location.pathname.includes('/app-store/006');
+}
+
+function isAddAppEnabled() {
+    return localStorage.getItem(ADD_APP_ID) !== 'removed';
+}
+
+function toggleAppInstallation(appId, shouldEnable) {
+    if (appId === ADD_APP_ID) {
+        if (isAddAppAlwaysVisible()) {
+            localStorage.setItem(ADD_APP_ID, 'added');
+        } else {
+            localStorage.setItem(ADD_APP_ID, shouldEnable ? 'added' : 'removed');
+        }
+        updateHomeScreen();
+        return;
+    }
+
+    if (shouldEnable) {
+        localStorage.setItem(appId, 'added');
+    } else {
+        localStorage.removeItem(appId);
+    }
+
+    updateHomeScreen();
 }
 
 function getAppLink(appId) {
@@ -54,7 +77,7 @@
             return '../app-store/apps/002-001/fetch.html';
         case '002-002':
             return 'http://hbnb.local:81';
-        case '999-999':
+        case ADD_APP_ID:
             return '../app-store/002b.html';
         default:
             return '#';
@@ -73,28 +96,34 @@
     const appsContainer = document.getElementById('apps-container');
     appsContainer.innerHTML = ''; // Clear existing apps
 
-    const appIds = ['002-001', '002-002', '999-999']; // Using class-based IDs
+    const appIds = ['002-001', '002-002', ADD_APP_ID];
     appIds.forEach(appId => {
+        const isPlaceholder = appId === ADD_APP_ID;
         const appInstalled = localStorage.getItem(appId) === 'added';
+        const addAppAlwaysVisible = isAddAppAlwaysVisible();
+        const addAppEnabled = addAppAlwaysVisible || isAddAppEnabled();
+        const checkboxShouldBeChecked = isPlaceholder ? addAppEnabled : appInstalled;
         const appElement = document.createElement('a');
-        const isPlaceholder = appId === '999-999';
-        appElement.href = getAppLink(appId); // Set the hyperlink
-        appElement.className = `app-card-link${isPlaceholder ? ' app-card-link--inactive' : ''}`;
+        appElement.href = getAppLink(appId);
+        appElement.className = 'app-card-link';
         appElement.dataset.appId = appId;
         appElement.draggable = true;
-        appElement.style.cursor = isPlaceholder ? 'default' : 'pointer';
-        if (isPlaceholder) {
+        appElement.style.cursor = 'pointer';
+
+        if (isPlaceholder && !addAppEnabled) {
             appElement.setAttribute('aria-disabled', 'true');
+        } else {
+            appElement.removeAttribute('aria-disabled');
         }
 
         const toggleAttributes = [];
-        if (appInstalled || isPlaceholder) {
+        if (checkboxShouldBeChecked) {
             toggleAttributes.push('checked');
         }
-        if (isPlaceholder) {
+        if (isPlaceholder && addAppAlwaysVisible) {
             toggleAttributes.push('disabled');
         }
-        const cardClasses = `app-card${isPlaceholder ? ' app-card--disabled' : ''}`;
+        const cardClasses = 'app-card';
         const altText = isPlaceholder ? 'Add new app' : `Hβnβ entertainment app icon ${appId}`;
 
         appElement.innerHTML = `
@@ -112,11 +141,10 @@
         appsContainer.appendChild(appElement);
     });
 
-    // Re-attach click listeners to newly created checkboxes
     const checkboxes = document.querySelectorAll('.app-checkbox');
     checkboxes.forEach(checkbox => {
-        checkbox.addEventListener('click', function() {
-            toggleAppInstallation(this.id);
+        checkbox.addEventListener('change', function() {
+            toggleAppInstallation(this.id, this.checked);
         });
     });
 }
diff --git a/static/gui/app-store/003.html b/static/gui/app-store/003.html
index ddb0533cf..368f97c0a 100755
--- a/static/gui/app-store/003.html
+++ b/static/gui/app-store/003.html
@@ -58,8 +58,8 @@
                         </article>
                 </a>
 
-                <a class="app-card-link app-card-link--inactive" href="#" aria-disabled="true">
-                        <article class="app-card app-card--disabled" data-app-id="999-999">
+                <a class="app-card-link" href="#">
+                        <article class="app-card" data-app-id="999-999">
                                 <div class="app-card__icon-wrapper">
                                         <img class="app-card__icon" src="apps/999-999/logo.png" alt="Add new app" style="opacity: 0.4; filter: drop-shadow(2px 4px 1px black) invert(0.5);">
                                 </div>
diff --git a/static/gui/app-store/004.html b/static/gui/app-store/004.html
index 0818751bf..06a49d7f3 100755
--- a/static/gui/app-store/004.html
+++ b/static/gui/app-store/004.html
@@ -81,8 +81,8 @@
                         </article>
                 </a>
 
-                <a class="app-card-link app-card-link--inactive" href="#" aria-disabled="true">
-                        <article class="app-card app-card--disabled" data-app-id="999-999">
+                <a class="app-card-link" href="#">
+                        <article class="app-card" data-app-id="999-999">
                                 <div class="app-card__icon-wrapper">
                                         <img class="app-card__icon" src="apps/999-999/logo.png" alt="Add new app" style="opacity: 0.4; filter: drop-shadow(2px 4px 1px black) invert(0.5);">
                                 </div>
diff --git a/static/gui/app-store/005.html b/static/gui/app-store/005.html
index d8e428678..36d6f3329 100755
--- a/static/gui/app-store/005.html
+++ b/static/gui/app-store/005.html
@@ -56,8 +56,8 @@
                         </article>
                 </a>
 
-                <a class="app-card-link app-card-link--inactive" href="#" aria-disabled="true">
-                        <article class="app-card app-card--disabled" data-app-id="999-999">
+                <a class="app-card-link" href="#">
+                        <article class="app-card" data-app-id="999-999">
                                 <div class="app-card__icon-wrapper">
                                         <img class="app-card__icon" src="apps/999-999/logo.png" alt="Add new app" style="opacity: 0.4; filter: drop-shadow(2px 4px 1px black) invert(0.5);">
                                 </div>
diff --git a/static/gui/app-store/006.html b/static/gui/app-store/006.html
index e7607ca20..4c7601d56 100755
--- a/static/gui/app-store/006.html
+++ b/static/gui/app-store/006.html
@@ -56,8 +56,8 @@
                         </article>
                 </a>
 
-                <a class="app-card-link app-card-link--inactive" href="#" aria-disabled="true">
-                        <article class="app-card app-card--disabled" data-app-id="999-999">
+                <a class="app-card-link" href="#">
+                        <article class="app-card" data-app-id="999-999">
                                 <div class="app-card__icon-wrapper">
                                         <img class="app-card__icon" src="apps/999-999/logo.png" alt="Add new app" style="opacity: 0.4; filter: drop-shadow(2px 4px 1px black) invert(0.5);">
                                 </div>
diff --git a/static/gui/app-store/js/app-toggle.js b/static/gui/app-store/js/app-toggle.js
index cd226f64f..542fbd248 100644
--- a/static/gui/app-store/js/app-toggle.js
+++ b/static/gui/app-store/js/app-toggle.js
@@ -1,4 +1,44 @@
 (function () {
+  const ADD_APP_ID = '999-999';
+  const ADD_APP_REMOVED = 'removed';
+  const ADD_APP_ADDED = 'added';
+  const path = window.location.pathname;
+  const isProtectedContext =
+    path.includes('/app-store/006') || path.includes('/dashboard/006');
+
+  function isAddAppEnabled() {
+    if (isProtectedContext) {
+      return true;
+    }
+
+    return localStorage.getItem(ADD_APP_ID) !== ADD_APP_REMOVED;
+  }
+
+  function applyAddAppState(card) {
+    const checkbox = card.querySelector('.app-checkbox');
+    if (!checkbox) {
+      return;
+    }
+
+    const link = card.closest('.app-card-link');
+    const enabled = isAddAppEnabled();
+    const effectiveEnabled = isProtectedContext ? true : enabled;
+
+    checkbox.checked = effectiveEnabled;
+    checkbox.disabled = isProtectedContext;
+
+    card.classList.remove('app-card--disabled');
+
+    if (link) {
+      link.classList.remove('app-card-link--inactive');
+      if (effectiveEnabled) {
+        link.removeAttribute('aria-disabled');
+      } else {
+        link.setAttribute('aria-disabled', 'true');
+      }
+    }
+  }
+
   function syncCheckboxState(card) {
     const appId = card.dataset.appId;
     const checkbox = card.querySelector('.app-checkbox');
@@ -6,30 +46,44 @@
       return;
     }
 
-    const storedValue = localStorage.getItem(appId);
-    const isInstalled = storedValue === 'added' || (appId === '999-999' && storedValue !== 'removed');
+    if (appId === ADD_APP_ID) {
+      applyAddAppState(card);
+      return;
+    }
 
-    checkbox.checked = appId === '999-999' ? true : isInstalled;
+    const storedValue = localStorage.getItem(appId);
+    const isInstalled = storedValue === ADD_APP_ADDED;
 
-    if (appId === '999-999') {
-      checkbox.setAttribute('disabled', 'disabled');
-      card.classList.add('app-card--disabled');
-    }
+    checkbox.checked = isInstalled;
   }
 
-  function toggleAppInstallation(appId, checkbox) {
-    if (appId === '999-999') {
-      checkbox.checked = true;
+  function toggleAppInstallation(appId, checkbox, card) {
+    if (appId === ADD_APP_ID) {
+      if (isProtectedContext) {
+        checkbox.checked = true;
+        return;
+      }
+
+      const enabled = checkbox.checked;
+      localStorage.setItem(appId, enabled ? ADD_APP_ADDED : ADD_APP_REMOVED);
+      applyAddAppState(card);
+      refreshAddAppCards();
       return;
     }
 
     if (checkbox.checked) {
-      localStorage.setItem(appId, 'added');
+      localStorage.setItem(appId, ADD_APP_ADDED);
     } else {
       localStorage.removeItem(appId);
     }
   }
 
+  function refreshAddAppCards() {
+    document
+      .querySelectorAll('.app-card[data-app-id="' + ADD_APP_ID + '"]')
+      .forEach(applyAddAppState);
+  }
+
   document.addEventListener('DOMContentLoaded', function () {
     const cards = document.querySelectorAll('.app-card[data-app-id]');
 
@@ -43,8 +97,14 @@
       syncCheckboxState(card);
 
       checkbox.addEventListener('change', function () {
-        toggleAppInstallation(appId, checkbox);
+        toggleAppInstallation(appId, checkbox, card);
       });
     });
   });
+
+  window.addEventListener('storage', function (event) {
+    if (event.key === ADD_APP_ID) {
+      refreshAddAppCards();
+    }
+  });
 })();
diff --git a/static/gui/dashboard/002.html b/static/gui/dashboard/002.html
index 7f6d8924d..6dbf5654f 100755
--- a/static/gui/dashboard/002.html
+++ b/static/gui/dashboard/002.html
@@ -170,15 +170,28 @@
 
 <script>
 
+const ADD_APP_ID = '999-999';
+
+function isAddAppAlwaysVisible() {
+    return window.location.pathname.includes('/dashboard/006');
+}
+
+function shouldDisplayAddAppIcon() {
+    return isAddAppAlwaysVisible() || localStorage.getItem(ADD_APP_ID) !== 'removed';
+}
+
 function updateHomeScreen() {
     const appsContainer = document.getElementById('apps-container');
-    appsContainer.innerHTML = ''; // Clear existing apps
-    const appIds = ['002-001', '002-002', '999-999']; // Using class-based IDs
+    appsContainer.innerHTML = '';
+    const appIds = ['002-001', '002-002', ADD_APP_ID];
     appIds.forEach(appId => {
         const appInstalled = localStorage.getItem(appId) === 'added';
-        if (appInstalled || appId === '999-999') {
+        const isAddApp = appId === ADD_APP_ID;
+        const canShowAddApp = isAddApp ? shouldDisplayAddAppIcon() : false;
+
+        if (appInstalled || (isAddApp && canShowAddApp)) {
             const appElement = document.createElement('a');
-            appElement.href = getAppLink(appId); // Set the hyperlink
+            appElement.href = getAppLink(appId);
             appElement.style.cursor = 'pointer';
             appElement.innerHTML = `
                 <div class="square-${appId}">
@@ -187,7 +200,7 @@
                             <div class="table-cell-${appId}">
                                 <img class="rs-${appId}" src="../app-store/apps/${appId}/logo.png">
                                 <br>
-                                <img src="../app-store/apps/${appId}/title.svg" style="width:75%; height:5vw; margin-top:-1.95pc;">                           
+                                <img src="../app-store/apps/${appId}/title.svg" style="width:75%; height:5vw; margin-top:-1.95pc;">
                                 <br>
                             </div>
                         </div>
@@ -226,7 +239,7 @@
             return '../app-store/apps/002-001/fetch.html';
         case '002-002':
             return 'http://hbnb.local:81';
-        case '999-999':
+        case ADD_APP_ID:
             return '../app-store/002.html';
     }
 }
@@ -245,14 +258,14 @@
     const appElement = document.getElementById(appId);
     if (appElement) {
         // Check if the dropped app is the one you want to prevent from being deleted
-        if (appId !== '999-999') {
+        if (appId !== ADD_APP_ID) {
             appElement.remove();
             localStorage.removeItem(appId);
             updateAppStore(); // Update app store after removal
             
             // Reload only the apps-container to update the remaining app icons
             const appsContainer = document.getElementById('apps-container');
-    psContainer.innerHTML = ''; // Clear existing apps
+            appsContainer.innerHTML = ''; // Clear existing apps
             updateHomeScreen(); // Repopulate the apps-container with updated app icons
         } else {
             // Do something (like displaying a message) to indicate that dropping this app is not allowed
@@ -262,7 +275,7 @@
 }
 
 function updateAppStore() {
-    const appIds = ['002-001', '002-002', '999-999'];
+    const appIds = ['002-001', '002-002', ADD_APP_ID];
     appIds.forEach(appId => {
         const installState = localStorage.getItem(appId);
         const installAppCheckbox = document.getElementById(appId);
diff --git a/static/gui/dashboard/003.html b/static/gui/dashboard/003.html
index e0646e9a6..1478c49ce 100755
--- a/static/gui/dashboard/003.html
+++ b/static/gui/dashboard/003.html
@@ -176,15 +176,28 @@
  
 
 <script>
+const ADD_APP_ID = '999-999';
+
+function isAddAppAlwaysVisible() {
+    return window.location.pathname.includes('/dashboard/006');
+}
+
+function shouldDisplayAddAppIcon() {
+    return isAddAppAlwaysVisible() || localStorage.getItem(ADD_APP_ID) !== 'removed';
+}
+
 function updateHomeScreen() {
     const appsContainer = document.getElementById('apps-container');
-    appsContainer.innerHTML = ''; // Clear existing apps
-    const appIds = ['003-001', '999-999']; // Using class-based IDs
+    appsContainer.innerHTML = '';
+    const appIds = ['003-001', ADD_APP_ID];
     appIds.forEach(appId => {
         const appInstalled = localStorage.getItem(appId) === 'added';
-        if (appInstalled || appId === '999-999') {
+        const isAddApp = appId === ADD_APP_ID;
+        const canShowAddApp = isAddApp ? shouldDisplayAddAppIcon() : false;
+
+        if (appInstalled || (isAddApp && canShowAddApp)) {
             const appElement = document.createElement('a');
-            appElement.href = getAppLink(appId); // Set the hyperlink
+            appElement.href = getAppLink(appId);
             appElement.style.cursor = 'pointer';
             appElement.innerHTML = `
                 <div class="square-${appId}">
@@ -210,7 +223,7 @@
     switch (appId) {
         case '003-001':
             return '../app-store/apps/003-001/fetch.html';
-        case '999-999':
+        case ADD_APP_ID:
             return '../app-store/003.html';
     }
 }
diff --git a/static/gui/dashboard/004.html b/static/gui/dashboard/004.html
index 6813a9b81..d76ee9987 100755
--- a/static/gui/dashboard/004.html
+++ b/static/gui/dashboard/004.html
@@ -165,15 +165,28 @@
 
 <script>
 
+const ADD_APP_ID = '999-999';
+
+function isAddAppAlwaysVisible() {
+    return window.location.pathname.includes('/dashboard/006');
+}
+
+function shouldDisplayAddAppIcon() {
+    return isAddAppAlwaysVisible() || localStorage.getItem(ADD_APP_ID) !== 'removed';
+}
+
 function updateHomeScreen() {
     const appsContainer = document.getElementById('apps-container');
-    appsContainer.innerHTML = ''; // Clear existing apps
-    const appIds = ['004-001', '004-002', '004-003', '004-004', '999-999']; // Using class-based IDs
+    appsContainer.innerHTML = '';
+    const appIds = ['004-001', '004-002', '004-003', '004-004', ADD_APP_ID];
     appIds.forEach(appId => {
         const appInstalled = localStorage.getItem(appId) === 'added';
-        if (appInstalled || appId === '999-999') {
+        const isAddApp = appId === ADD_APP_ID;
+        const canShowAddApp = isAddApp ? shouldDisplayAddAppIcon() : false;
+
+        if (appInstalled || (isAddApp && canShowAddApp)) {
             const appElement = document.createElement('a');
-            appElement.href = getAppLink(appId); // Set the hyperlink
+            appElement.href = getAppLink(appId);
             appElement.style.cursor = 'pointer';
             appElement.innerHTML = `
                 <div class="square-${appId}">
@@ -182,7 +195,7 @@
                             <div class="table-cell-${appId}">
                                 <img class="rs-${appId}" src="../app-store/apps/${appId}/logo.png">
                                 <br>
-                                <img src="../app-store/apps/${appId}/title.svg" style="width:75%; height:5vw; margin-top:-1.95pc;">                           
+                                <img src="../app-store/apps/${appId}/title.svg" style="width:75%; height:5vw; margin-top:-1.95pc;">
                                 <br>
                             </div>
                         </div>
@@ -225,7 +238,7 @@
             return '../app-store/apps/004-003/fetch.html';
         case '004-004':
             return '../app-store/apps/004-004/fetch.html';
-        case '999-999':
+        case ADD_APP_ID:
             return '../app-store/004.html';
     }
 }
@@ -244,14 +257,14 @@
     const appElement = document.getElementById(appId);
     if (appElement) {
         // Check if the dropped app is the one you want to prevent from being deleted
-        if (appId !== '999-999') {
+        if (appId !== ADD_APP_ID) {
             appElement.remove();
             localStorage.removeItem(appId);
             updateAppStore(); // Update app store after removal
             
             // Reload only the apps-container to update the remaining app icons
             const appsContainer = document.getElementById('apps-container');
-    psContainer.innerHTML = ''; // Clear existing apps
+            appsContainer.innerHTML = ''; // Clear existing apps
             updateHomeScreen(); // Repopulate the apps-container with updated app icons
         } else {
             // Do something (like displaying a message) to indicate that dropping this app is not allowed
@@ -261,7 +274,7 @@
 }
 
 function updateAppStore() {
-    const appIds = ['004-001', '004-002', '004-003', '004-004', '999-999'];
+    const appIds = ['004-001', '004-002', '004-003', '004-004', ADD_APP_ID];
     appIds.forEach(appId => {
         const installState = localStorage.getItem(appId);
         const installAppCheckbox = document.getElementById(appId);
diff --git a/static/gui/dashboard/005.html b/static/gui/dashboard/005.html
index b697d52ce..725bfc935 100755
--- a/static/gui/dashboard/005.html
+++ b/static/gui/dashboard/005.html
@@ -148,22 +148,32 @@
 <script src="media/js/main.js"></script>
 
 <script>
+const ADD_APP_ID = '999-999';
+
+function isAddAppAlwaysVisible() {
+    return window.location.pathname.includes('/dashboard/006');
+}
+
+function shouldDisplayAddAppIcon() {
+    return isAddAppAlwaysVisible() || localStorage.getItem(ADD_APP_ID) !== 'removed';
+}
+
 function updateHomeScreen() {
     const appsContainer = document.getElementById('apps-container');
-    appsContainer.innerHTML = ''; // Clear existing apps
+    appsContainer.innerHTML = '';
 
-    let allAppIds = ['005-001', '005-002']; // All potential app IDs for this page
-    let appsToDisplay = [];
+    const allAppIds = ['005-001', '005-002'];
+    const appsToDisplay = [];
 
-    // Add installed apps
     allAppIds.forEach(appId => {
         if (localStorage.getItem(appId) === 'added') {
             appsToDisplay.push(appId);
         }
     });
 
-    // Add the 'Add+' icon last
-    appsToDisplay.push('999-999');
+    if (shouldDisplayAddAppIcon()) {
+        appsToDisplay.push(ADD_APP_ID);
+    }
 
     appsToDisplay.forEach(appId => {
         const appElement = document.createElement('a');
@@ -195,13 +205,13 @@
 function getAppLink(appId) {
     switch (appId) {
         case '005-001':
-            return '#'; // Placeholder link
+            return '#';
         case '005-002':
-            return '#'; // Placeholder link
-        case '999-999':
-            return '../app-store/005.html'; // Link to its own app-store page
+            return '#';
+        case ADD_APP_ID:
+            return '../app-store/005.html';
         default:
-            return '#'; // Fallback for any unhandled appIds
+            return '#';
     }
 }