diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte
index 7dae8bb066..d1b51c71e3 100644
--- a/src/lib/components/navbar.svelte
+++ b/src/lib/components/navbar.svelte
@@ -139,6 +139,7 @@
     }
 
     beforeNavigate(() => (showAccountMenu = false));
+
     onMount(() => {
         if (resolvedProfile.showExtendedAccountsMenu) {
             fetchImagineCredits(currentOrg);
@@ -300,7 +301,7 @@
                                         direction="row"
                                         justifyContent="space-between"
                                         alignItems="center"
-                                        >{credits} Credits left
+                                        >{credits} Credit(s) left
                                     </Layout.Stack>
                                     <svelte:fragment slot="more">
                                         <ProgressBar
diff --git a/src/lib/studio/studio.svelte b/src/lib/studio/studio.svelte
index 283ca5f6e5..1f24b3c892 100644
--- a/src/lib/studio/studio.svelte
+++ b/src/lib/studio/studio.svelte
@@ -57,7 +57,7 @@
             },
             onUpgrade: async () => {
                 const organization = get(organizationStore).$id;
-                goto(
+                await goto(
                     resolve('/(console)/organization-[organization]/change-plan', {
                         organization: organization
                     })
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index a3c25857fa..a9f1b71e74 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { afterNavigate, goto, invalidate } from '$app/navigation';
-    import { base } from '$app/paths';
+    import { afterNavigate, beforeNavigate, goto, invalidate } from '$app/navigation';
+    import { base, resolve } from '$app/paths';
     import { page } from '$app/state';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { PlanComparisonBox, PlanSelection, SelectPaymentMethod } from '$lib/components/billing';
@@ -36,8 +36,10 @@
     import type { OrganizationUsage } from '$lib/sdk/billing';
     import type { Models } from '@appwrite.io/console';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { resolvedProfile } from '$lib/profiles/index.svelte';
+    import { ProfileMode, resolvedProfile } from '$lib/profiles/index.svelte';
     import { isFreePlan, isPaidPlan } from '$lib/helpers/billing.js';
+    import { studioRef } from '$lib/studio/studio-widget';
+    import { hash } from '$lib/helpers/string';
 
     export let data;
 
@@ -45,7 +47,7 @@
 
     let selectedPlan: BillingPlan = data.plan as BillingPlan;
 
-    let previousPage: string = base;
+    let previousPage: string = resolve('/');
     let showExitModal = false;
     let formComponent: Form;
     let usageLimitsComponent:
@@ -116,6 +118,18 @@
         }
     });
 
+    async function compatNavigation(url: string) {
+        if (resolvedProfile.id === ProfileMode.STUDIO) {
+            if (window) {
+                window.location.href = url;
+            } else {
+                await goto(url);
+            }
+        } else {
+            await goto(url);
+        }
+    }
+
     async function loadPaymentMethods() {
         paymentMethods = await sdk.forConsole.billing.listPaymentMethods();
         return paymentMethods;
@@ -178,7 +192,7 @@
 
             await Promise.all([trackDowngradeFeedback(), invalidate(Dependencies.ORGANIZATION)]);
 
-            await goto(previousPage);
+            await compatNavigation(previousPage);
 
             addNotification({
                 type: 'success',
@@ -204,7 +218,8 @@
                 await invalidate(Dependencies.ACCOUNT);
                 await invalidate(Dependencies.ORGANIZATION);
 
-                await goto(previousPage);
+                await compatNavigation(previousPage);
+
                 addNotification({
                     type: 'success',
                     message: 'Your organization has been upgraded'
@@ -275,7 +290,8 @@
                 await invalidate(Dependencies.ACCOUNT);
                 await invalidate(Dependencies.ORGANIZATION);
 
-                await goto(previousPage);
+                await compatNavigation(previousPage);
+
                 addNotification({
                     type: 'success',
                     message: 'Your organization has been upgraded'