diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue
index f1bcb2e..23fe5b6 100644
--- a/src/layout/AppMenu.vue
+++ b/src/layout/AppMenu.vue
@@ -7,8 +7,6 @@ import AppMenuItem from './AppMenuItem.vue';
 const userPrefStore = UserPrefStore();
 
 
-
-
 const model = ref([
     {
         label: '',
@@ -41,9 +39,12 @@ function updateApplicationsMenu() {
             { label: 'Rev Eng Code', icon: 'pi pi-fw pi-id-card', to: '/app-browser' }
         ];
 
-        selectedApp.available_scenarios.forEach(app => {
-            model.value[0].items.push({ label: app.label, icon: 'pi pi-fw pi-id-card', to: `/scenario/exec/${app.scenario_id}`  });
-        });
+        if( selectedApp.available_scenarios.length > 0) {
+            selectedApp.available_scenarios.forEach(app => {
+                model.value[0].items.push({ label: app.label, icon: 'pi pi-fw pi-id-card', to: `/scenario/exec/${app.scenario_id}`  });
+            });
+        }
+      
     
     } else {
         // Se selectedApp è nullo, svuota gli item
diff --git a/src/layout/AppTopbar.vue b/src/layout/AppTopbar.vue
index 2fd5814..db31234 100644
--- a/src/layout/AppTopbar.vue
+++ b/src/layout/AppTopbar.vue
@@ -8,11 +8,11 @@ import { LoadingStore } from '../stores/LoadingStore.js';
 import { ScenarioStore } from '../stores/ScenarioStore.js';
 import { UserPrefStore } from '../stores/UserPrefStore.js';
 
+import { ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import AppConfigurator from './AppConfigurator.vue';
 import AppProfileMenu from './AppProfileMenu.vue';
 
-
 const auth     = useAuth();
 const route = useRoute();
 
@@ -23,8 +23,23 @@ const userPrefStore = UserPrefStore();
 const scenario_store = ScenarioStore();
 const loadingStore = LoadingStore()
 
+
+const selectedApp = ref(userPrefStore.getSelApp);
+
 const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
 
+async function updateApplication() {
+    await userPrefStore.setSelectedApp(selectedApp.value);
+
+    scenario_store.fetchApplicationScenarios(); 
+
+}
+
+function  appUpdated() {
+    selectedApp.value = userPrefStore.getSelApp;
+}
+
+watch(() => userPrefStore.getSelApp, appUpdated, { immediate: true });
 
 </script>
 
@@ -85,12 +100,12 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
             </div>
 
             <Dropdown 
-                        v-model="userPrefStore.selectedApp"
+                        v-model="selectedApp"
                         :options="userPrefStore.availableApp"
                         optionLabel="fe_name"
                         placeholder="Select an Option"
                         class="dropdown-list"
-                        @change="scenario_store.fetchApplicationScenarios()"
+                        @change="updateApplication()"
                         :disabled="route.path === '/projects'"
                     />
             <button
diff --git a/src/main.js b/src/main.js
index 2335e93..fb657b5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -52,7 +52,7 @@ var auth = createAuth({
     }
 });
 
-axios.defaults.baseURL = import.meta.env.VITE_BACKEND_URL;//'http://localhost:8081'
+axios.defaults.baseURL = 'http://localhost:8081'///import.meta.env.VITE_BACKEND_URL;//
 console.log(import.meta.env.VITE_BACKEND_URL);
 
 const app = createApp(App);
diff --git a/src/service/ProjectService.js b/src/service/ProjectService.js
index 3a84a29..f9dd3d8 100644
--- a/src/service/ProjectService.js
+++ b/src/service/ProjectService.js
@@ -15,6 +15,10 @@ export const ProjectService = {
         return axios.post('/updateSelectedProject', data)
 
     }
+,
+    updateSelectedApplication(data) {     
+        return axios.post('/updateSelectedApplication', data)
+    }
 
    /* {
         projectName: selectedProjectName 
diff --git a/src/stores/ScenarioStore.js b/src/stores/ScenarioStore.js
index ca2dd2a..682a926 100644
--- a/src/stores/ScenarioStore.js
+++ b/src/stores/ScenarioStore.js
@@ -41,11 +41,11 @@ export const ScenarioStore = defineStore('scenario_store', () => {
 
     async function fetchApplicationScenarios() {
         loadingStore.scenario_loading = true;
-
+        console.log("fetchApplicationScenarios >= selectedApp", userPrefStore.selectedApp)  ;
         await  ScenarioService.getScenariosApplication(userPrefStore.selectedApp).then(resp=>{
             console.log("response scenari", resp);
             applicationScenarios.value = resp.data
-            allScenarios.value = [...projectScenarios.value, ...applicationScenarios.value]            
+            allScenarios.value = [...projectScenarios.value, ...applicationScenarios.value]
             loadingStore.scenario_loading = false;
 
         })
diff --git a/src/stores/UserPrefStore.js b/src/stores/UserPrefStore.js
index 152425e..fa6f002 100644
--- a/src/stores/UserPrefStore.js
+++ b/src/stores/UserPrefStore.js
@@ -18,6 +18,7 @@ export const UserPrefStore = defineStore('userpref_store', () => {
       loadingStore.user_loading = true;
       await auth.fetch().then((fetchedUser) => {
           user.value = fetchedUser.data.data;
+          selectedApp.value = user.value.selectedApplication;
           userLoaded.value = true;
           loadingStore.user_loading = false;
       }).catch((error) => {
@@ -29,11 +30,8 @@ export const UserPrefStore = defineStore('userpref_store', () => {
       try {
           loadingStore.user_loading = true;
           selectedApp.value = null;
-          
           // Aspetta che l'aggiornamento del progetto finisca
           await ProjectService.updateSelectedProject(project);
-
-
           
       } catch (error) {
           console.error("Errore durante l'aggiornamento del progetto:", error);
@@ -46,8 +44,11 @@ export const UserPrefStore = defineStore('userpref_store', () => {
 
   
 
-    function setSelectedApp(app){
+    async function setSelectedApp(app){
+      loadingStore.user_loading = true;
+      await ProjectService.updateSelectedApplication(app);
       selectedApp.value = app;
+      loadingStore.user_loading = false;      
     }
 
     const selectedProject = computed(() => user.value.selectedProject)