diff --git a/src/components/Apps/AppsLibrary.tsx b/src/components/Apps/AppsLibrary.tsx
index f3bd7c1..cfe5b3f 100644
--- a/src/components/Apps/AppsLibrary.tsx
+++ b/src/components/Apps/AppsLibrary.tsx
@@ -165,7 +165,8 @@ export const AppsLibrary = ({  availableQapps, setMode, myName, hasPublishApp, i
         <ShowMessageReturnButton sx={{
             padding: '2px'
           }} onClick={() => {
-                    setMode('home')
+            executeEvent("navigateBack", {});
+
                   }}>
                     <MailIconImg src={ReturnSVG} />
                     <ComposeP>Return to Apps Dashboard</ComposeP>
diff --git a/src/components/Apps/AppsLibraryDesktop.tsx b/src/components/Apps/AppsLibraryDesktop.tsx
index 80a8c09..20a631a 100644
--- a/src/components/Apps/AppsLibraryDesktop.tsx
+++ b/src/components/Apps/AppsLibraryDesktop.tsx
@@ -224,7 +224,7 @@ export const AppsLibraryDesktop = ({
           <ShowMessageReturnButton sx={{
             padding: '2px'
           }} onClick={() => {
-                    setMode('home')
+            executeEvent("navigateBack", {});
                   }}>
                     <MailIconImg src={ReturnSVG} />
                     <ComposeP>Return to Apps Dashboard</ComposeP>