diff --git a/apps/dashboard/src/lib/features/course/pages/settings.svelte b/apps/dashboard/src/lib/features/course/pages/settings.svelte
index 27e98764..5e91678f 100644
--- a/apps/dashboard/src/lib/features/course/pages/settings.svelte
+++ b/apps/dashboard/src/lib/features/course/pages/settings.svelte
@@ -270,7 +270,7 @@
     return selected;
   });
 
-  let courseLink = $derived(courseApi.course?.slug ? `${$currentOrgDomain}/course/${courseApi.course.slug}` : '');
+  let courseLink = $derived(courseApi.course?.slug ? `${$currentOrgDomain}/course/${courseApi.course.slug}` : '#');
 </script>
 
 <UnsavedChanges bind:hasUnsavedChanges />
@@ -352,7 +352,7 @@
             <IconButton onclick={generateNewCourseLink}>
               <RotateCcwIcon size={16} />
             </IconButton>
-            <IconButton onclick={() => goto(courseLink)}>
+            <IconButton href={courseLink} target="_blank">
               <ArrowUpRightIcon size={16} />
             </IconButton>
           </div>
diff --git a/apps/dashboard/src/lib/utils/store/org.ts b/apps/dashboard/src/lib/utils/store/org.ts
index e00565e1..d5b3f2f0 100644
--- a/apps/dashboard/src/lib/utils/store/org.ts
+++ b/apps/dashboard/src/lib/utils/store/org.ts
@@ -60,6 +60,8 @@ export const currentOrgPath = derived(currentOrg, ($currentOrg) =>
 );
 
 export const currentOrgDomain = derived(currentOrg, ($currentOrg) => {
+  if (PUBLIC_IS_SELFHOSTED === 'true') return window.location.origin;
+
   const browserOrigin = dev && browser && window.location.origin;
 
   // Get the root domain from window.location