diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx
index b6a188e..0f4cf15 100644
--- a/src/components/Apps/AppsDesktop.tsx
+++ b/src/components/Apps/AppsDesktop.tsx
@@ -259,6 +259,7 @@ export const AppsDesktop = ({ mode, setMode, show , myName, goToHome, setDesktop
     } else {
       setSelectedTab(copyTabs[0]);
     }
+    console.log('copyTabs', copyTabs)
     setTabs(copyTabs);
     setSelectedTab(copyTabs[0]);
     setTimeout(() => {
diff --git a/src/components/Apps/AppsDevMode.tsx b/src/components/Apps/AppsDevMode.tsx
index e5ea771..08782f0 100644
--- a/src/components/Apps/AppsDevMode.tsx
+++ b/src/components/Apps/AppsDevMode.tsx
@@ -131,10 +131,10 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
   
 
   useEffect(() => {
-    subscribeToEvent("setSelectedTab", setSelectedTabFunc);
+    subscribeToEvent("setSelectedTabDevMode", setSelectedTabFunc);
 
     return () => {
-      unsubscribeFromEvent("setSelectedTab", setSelectedTabFunc);
+      unsubscribeFromEvent("setSelectedTabDevMode", setSelectedTabFunc);
     };
   }, [tabs, isNewTabWindow]);
 
@@ -149,7 +149,7 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
     setTabs(copyTabs);
     setSelectedTab(copyTabs[0]);
     setTimeout(() => {
-      executeEvent("setTabsToNav", {
+      executeEvent("appsDevModeSetTabsToNav", {
         data: {
           tabs: copyTabs,
           selectedTab: copyTabs[0],
@@ -159,10 +159,10 @@ export const AppsDevMode = ({ mode, setMode, show , myName, goToHome, setDesktop
   };
 
   useEffect(() => {
-    subscribeToEvent("removeTab", removeTabFunc);
+    subscribeToEvent("removeTabDevMode", removeTabFunc);
 
     return () => {
-      unsubscribeFromEvent("removeTab", removeTabFunc);
+      unsubscribeFromEvent("removeTabDevMode", removeTabFunc);
     };
   }, [tabs]);
 
diff --git a/src/components/Apps/AppsDevModeTabComponent.tsx b/src/components/Apps/AppsDevModeTabComponent.tsx
index a0bc61a..eee87e2 100644
--- a/src/components/Apps/AppsDevModeTabComponent.tsx
+++ b/src/components/Apps/AppsDevModeTabComponent.tsx
@@ -10,12 +10,12 @@ export const AppsDevModeTabComponent = ({isSelected, app}) => {
   return (
     <ButtonBase onClick={()=> {
         if(isSelected){
-            executeEvent('removeTab', {
+            executeEvent('removeTabDevMode', {
                 data: app
             })
             return
         }
-        executeEvent('setSelectedTab', {
+        executeEvent('setSelectedTabDevMode', {
             data: app,
             isDevMode: true
         })
diff --git a/src/components/Apps/AppsNavBarDesktop.tsx b/src/components/Apps/AppsNavBarDesktop.tsx
index c23fd93..6571bc3 100644
--- a/src/components/Apps/AppsNavBarDesktop.tsx
+++ b/src/components/Apps/AppsNavBarDesktop.tsx
@@ -117,7 +117,6 @@ export const AppsNavBarDesktop = () => {
 
   const setTabsToNav = (e) => {
     const { tabs, selectedTab, isNewTabWindow } = e.detail?.data;
-
     setTabs([...tabs]);
     setSelectedTab(!selectedTab ? null : { ...selectedTab });
     setIsNewTabWindow(isNewTabWindow);
@@ -137,6 +136,8 @@ export const AppsNavBarDesktop = () => {
     (item) =>
       item?.name === selectedTab?.name && item?.service === selectedTab?.service
   );
+
+  console.log('tabs', tabs)
   return (
     <AppsNavBarParent
       sx={{