diff --git a/i18n/en/code.json b/i18n/en/code.json
index 7e32aa9b62..d949ec747d 100644
--- a/i18n/en/code.json
+++ b/i18n/en/code.json
@@ -262,13 +262,13 @@
     "message": "Categories"
   },
   "home_page.select_platform": {
-    "message": "Select platform"
+    "message": "Select a platform"
   },
   "home_page.select_platform_2": {
     "message": "Get documentation based on the AI Unlimited platform."
   },
   "home_page.edition_cloud": {
-    "message": "Cloud Service Provider"
+    "message": "Cloud service provider"
   },
   "home_page.edition_ms_fabric": {
     "message": "Microsoft Fabric"
diff --git a/src/components/SelectComponent/SelectComponent.js b/src/components/SelectComponent/SelectComponent.js
index 18dea779bd..fdfa5b2617 100644
--- a/src/components/SelectComponent/SelectComponent.js
+++ b/src/components/SelectComponent/SelectComponent.js
@@ -13,20 +13,63 @@ export default function SelectComponent() {
   const fabricUrl = useBaseUrl('/ai-unlimited/fabric/get-started');
   const pathsNoAlert = normalizePath(`/quickstarts/`);
   const shouldDisplayAlert = !currentPath.includes(pathsNoAlert);
+  const selectedOptionZeroPaths = [
+    aiUnlimitedUrl,
+    useBaseUrl('/ai-unlimited/install-ai-unlimited/deploy-manager-aws-console'),
+    useBaseUrl('/ai-unlimited/install-ai-unlimited/deploy-manager-azure-portal'),
+    useBaseUrl('/ai-unlimited/install-ai-unlimited/setup-ai-unlimited'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/get-api-key'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/create-first-project'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/collaborate-project'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/project-flow'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/use-cases'),
+    useBaseUrl('/ai-unlimited/explore-and-analyze-data/magic-commands'),
+    useBaseUrl('/ai-unlimited/manage-ai-unlimited'),
+    useBaseUrl('/ai-unlimited/manage-ai-unlimited/add-collaborators'),
+    useBaseUrl('/ai-unlimited/manage-ai-unlimited/suspend-and-restore-project'),
+    useBaseUrl('/ai-unlimited/manage-ai-unlimited/change-settings'),
+    useBaseUrl('/ai-unlimited/resources'),
+    useBaseUrl('/ai-unlimited/resources/aws-account-requirements'),
+    useBaseUrl('/ai-unlimited/resources/azure-account-requirements'),
+    useBaseUrl('/ai-unlimited/resources/create-oauth-app'),
+    useBaseUrl('/ai-unlimited/resources/jupyterlab'),
+    useBaseUrl('/ai-unlimited/resources/jupyterlab/deploy-jupyter-aws-console'), 
+    useBaseUrl('/ai-unlimited/resources/jupyterlab/deploy-jupyter-azure-portal'),
+    useBaseUrl('/ai-unlimited/resources/jupyterlab/run-jupyter-docker'),
+    useBaseUrl('/ai-unlimited/resources/quickstart'),
+    useBaseUrl('/ai-unlimited/resources/quickstart/run-ai-unlimited-jupyterlab-docker'),
+    useBaseUrl(`/ai-unlimited/resources/quickstart/docker-when-you're-done`),
+    useBaseUrl('/ai-unlimited/whats-new'),
+    useBaseUrl('/ai-unlimited/whats-new/release-notes'),
+    useBaseUrl('/ai-unlimited/faq'),
+    useBaseUrl('/ai-unlimited/glossary'),
+    useBaseUrl('/ai-unlimited/support'),
+  ];
 
+  const selectedOptionOnePaths = [
+    fabricUrl,
+    fabricUrl,
+    useBaseUrl('/ai-unlimited/fabric/get-started/create-notebook'),
+    useBaseUrl('/ai-unlimited/fabric/get-started/load-data'),
+    useBaseUrl('/ai-unlimited/fabric/get-started/connect-explore'),
+    useBaseUrl('/ai-unlimited/fabric/first-use-case'),
+    useBaseUrl('/ai-unlimited/fabric/in-db-functions'),
+  ];
+  
   useEffect(() => {
-    if (currentPath === aiUnlimitedUrl) {
+    if (selectedOptionZeroPaths.includes(currentPath)) {
       setSelectedOption('0');
-    } else if (currentPath === fabricUrl) {
+    } else if (selectedOptionOnePaths.includes(currentPath)) {
       setSelectedOption('1');
     }
   }, [currentPath, aiUnlimitedUrl, fabricUrl]);
 
   const handleSelection = (event) => {
     const selectedIndex = event.detail.index?.toString();
-    if (selectedIndex === '0' && currentPath !== aiUnlimitedUrl) {
+    if (selectedIndex === '0' && !selectedOptionZeroPaths.includes(currentPath)) {
       window.location.href = aiUnlimitedUrl;
-    } else if (selectedIndex === '1' && currentPath !== fabricUrl) {
+    } else if (selectedIndex === '1' && !selectedOptionOnePaths.includes(currentPath)) {
       window.location.href = fabricUrl;
     }
   };
@@ -56,4 +99,4 @@ export default function SelectComponent() {
       }}
     </BrowserOnly>
   );
-}
+}
\ No newline at end of file