diff --git a/packages/marketplace/src/components/pages/client-app-detail/__test__/client-app-detail.test.tsx b/packages/marketplace/src/components/pages/client-app-detail/__test__/client-app-detail.test.tsx
index cbd900bca4..e5d7b5ea0d 100644
--- a/packages/marketplace/src/components/pages/client-app-detail/__test__/client-app-detail.test.tsx
+++ b/packages/marketplace/src/components/pages/client-app-detail/__test__/client-app-detail.test.tsx
@@ -195,12 +195,7 @@ describe('ClientAppDetail', () => {
   })
   describe('onBackToAppsButtonClick', () => {
     it('should run correctly', () => {
-      const fn = onBackToAppsButtonClick(history, 'DEVELOPER')
-      fn()
-      expect(history.push).toBeCalledWith(Routes.DEVELOPER_MY_APPS)
-    })
-    it('should run correctly', () => {
-      const fn = onBackToAppsButtonClick(history, 'CLIENT')
+      const fn = onBackToAppsButtonClick(history)
       fn()
       expect(history.push).toBeCalledWith(Routes.CLIENT)
     })
diff --git a/packages/marketplace/src/components/pages/client-app-detail/client-app-detail.tsx b/packages/marketplace/src/components/pages/client-app-detail/client-app-detail.tsx
index 32080167a9..a2bcc528bf 100644
--- a/packages/marketplace/src/components/pages/client-app-detail/client-app-detail.tsx
+++ b/packages/marketplace/src/components/pages/client-app-detail/client-app-detail.tsx
@@ -14,7 +14,7 @@ import { Loader, Button, Alert, FormSection } from '@reapit/elements'
 import clientAppDetailStyles from '@/styles/pages/client-app-detail.scss?mod'
 import ClientAppInstallConfirmation from '@/components/ui/client-app-detail/client-app-install-confirmation'
 import { Aside } from './aside'
-import { clientFetchAppDetailFailed } from '@/actions/client'
+import { clientFetchAppDetail } from '@/actions/client'
 import { developerApplyAppDetails } from '@/actions/developer'
 import { useParams } from 'react-router'
 import { Dispatch } from 'redux'
@@ -52,11 +52,8 @@ export const handleUnInstallAppButtonClick = (setIsVisibleUnInstallConfirmation:
   }
 }
 
-export const onBackToAppsButtonClick = (history: History, loginType: LoginType) => {
+export const onBackToAppsButtonClick = (history: History) => {
   return () => {
-    if (loginType === 'DEVELOPER') {
-      history.push(Routes.DEVELOPER_MY_APPS)
-    }
     history.push(Routes.CLIENT)
   }
 }
@@ -69,18 +66,14 @@ export const handleApplyAppDetailsFromLocalStorage = (
   if (loginType !== 'DEVELOPER' || !appId) return
   try {
     const appDataString = localStorage.getItem('developer-preview-app')
-    if (!appDataString) {
-      throw 'No app preview'
-    }
+    if (!appDataString) throw 'No preview data'
 
     const appData = JSON.parse(appDataString)
-    if (appData.id !== appId) {
-      throw 'No app preview'
-    }
+    if (appData.id !== appId) throw 'Preview data not match appId'
 
     dispatch(developerApplyAppDetails(appData))
   } catch (err) {
-    dispatch(clientFetchAppDetailFailed(err))
+    dispatch(clientFetchAppDetail({ id: appId }))
   }
 }
 
@@ -186,20 +179,22 @@ const ClientAppDetail: React.FC<ClientAppDetailProps> = () => {
           )}
         />
         <AppContent desktopIntegrationTypes={userDesktopIntegrationTypes} appDetailData={appDetailData} />
-        <FormSection className={clientAppDetailStyles.footerContainer}>
-          <div className={clientAppDetailStyles.hiddenInDesktopScreenSize}>
-            <ContactDeveloperSection
-              contact={{
-                developer,
-                telephone,
-                supportEmail,
-                homePage,
-              }}
-              hasGutter={false}
-            />
-          </div>
-          <Button onClick={onBackToAppsButtonClick(history, loginType)}>Back To Apps</Button>
-        </FormSection>
+        {loginType !== 'DEVELOPER' && (
+          <FormSection className={clientAppDetailStyles.footerContainer}>
+            <div className={clientAppDetailStyles.hiddenInDesktopScreenSize}>
+              <ContactDeveloperSection
+                contact={{
+                  developer,
+                  telephone,
+                  supportEmail,
+                  homePage,
+                }}
+                hasGutter={false}
+              />
+            </div>
+            <Button onClick={onBackToAppsButtonClick(history)}>Back To Apps</Button>
+          </FormSection>
+        )}
         {isVisibleUninstallConfirmation && (
           <ClientAppUninstallConfirmation
             visible={isVisibleUninstallConfirmation}
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/__snapshots__/app-content.test.tsx.snap b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/__snapshots__/app-content.test.tsx.snap
index 9151ef9d1c..bee3c5993d 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/__snapshots__/app-content.test.tsx.snap
+++ b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/__snapshots__/app-content.test.tsx.snap
@@ -74,17 +74,21 @@ exports[`AppContent AppContent - should match snapshoot 1`] = `
               See listing preview
             </span>
              
-            <FaExternalLinkAlt>
+            <FaExternalLinkAlt
+              onClick={[Function]}
+            >
               <IconBase
                 attr={
                   Object {
                     "viewBox": "0 0 512 512",
                   }
                 }
+                onClick={[Function]}
               >
                 <svg
                   fill="currentColor"
                   height="1em"
+                  onClick={[Function]}
                   stroke="currentColor"
                   strokeWidth="0"
                   style={
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
index c0316b91f0..71bf843398 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
@@ -10,6 +10,7 @@ import AppContent, {
   handleUninstallSuccess,
   renderAuthentication,
   renderInstallationsTable,
+  handleOpenAppPreview,
 } from '../app-content/app-content'
 import { Provider } from 'react-redux'
 import { ReduxState } from '@/types/core'
@@ -100,4 +101,14 @@ describe('AppContent', () => {
       expect(wrapper).toMatchSnapshot()
     })
   })
+
+  describe('handleOpenAppPreview', () => {
+    it('should run correctly', () => {
+      const appId = 'appId'
+      const spyOpenUrl = jest.spyOn(window, 'open')
+      const fn = handleOpenAppPreview(appId)
+      fn()
+      expect(spyOpenUrl).toBeCalledWith('developer/apps/appId/preview', '_blank')
+    })
+  })
 })
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
index 0d7a64ee7c..837321f023 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
@@ -92,6 +92,11 @@ export const handleUninstallSuccess = ({
   )
 }
 
+export const handleOpenAppPreview = (appId: string) => () => {
+  const url = `developer/apps/${appId}/preview`
+  window.open(url, '_blank')
+}
+
 export const CustomUninstallCell: React.FC<{ onClick: () => void }> = ({ onClick }) => (
   <a onClick={onClick}>Uninstall</a>
 )
@@ -146,7 +151,7 @@ const AppContent: React.FC<AppContentProps> = ({ appDetailState }) => {
       <div className={appDetailStyles.gutter}>
         <H5 className="flex items-center">
           <span className="mr-1">See listing preview</span>{' '}
-          <FaExternalLinkAlt className={developerAppDetailStyles.listPreviewIcon} />
+          <FaExternalLinkAlt className={developerAppDetailStyles.listPreviewIcon} onClick={handleOpenAppPreview(id)} />
         </H5>
         <p>The listing preview will display your app as it would appear in the Marketplace</p>
       </div>
diff --git a/packages/marketplace/src/tests/badges/badge-functions.svg b/packages/marketplace/src/tests/badges/badge-functions.svg
index da0ea73599..96fea2e99d 100644
--- a/packages/marketplace/src/tests/badges/badge-functions.svg
+++ b/packages/marketplace/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">80.03%</text><text x="1425" y="140" transform="scale(.1)" textLength="430">80.03%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#dfb317"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">80.03%</text><text x="1425" y="140" transform="scale(.1)" textLength="430">80.03%</text></g></svg>
diff --git a/packages/marketplace/src/tests/badges/badge-lines.svg b/packages/marketplace/src/tests/badges/badge-lines.svg
index 79f5b44491..c733a3b83b 100644
--- a/packages/marketplace/src/tests/badges/badge-lines.svg
+++ b/packages/marketplace/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.65%</text><text x="1185" y="140" transform="scale(.1)" textLength="430">90.65%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#4c1"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.65%</text><text x="1185" y="140" transform="scale(.1)" textLength="430">90.65%</text></g></svg>