diff --git a/src/components/MyKiva/BorrowerStatusCard.vue b/src/components/MyKiva/BorrowerStatusCard.vue
index 625edfd1fe..9ba51df6bd 100644
--- a/src/components/MyKiva/BorrowerStatusCard.vue
+++ b/src/components/MyKiva/BorrowerStatusCard.vue
@@ -54,7 +54,6 @@
 						</p>
 						<KvMaterialIcon
 							class="tw-w-3 tw-h-3 tw-text-action md:tw-hidden"
-							@click="open = !open"
 							:icon="open ? mdiChevronUp : mdiChevronDown"
 						/>
 					</button>
@@ -99,7 +98,6 @@ import {
 	toRefs,
 	defineProps,
 	inject,
-	onMounted,
 } from 'vue';
 import {
 	FUNDRAISING,
@@ -116,8 +114,6 @@ const props = defineProps({
 });
 
 const { loan } = toRefs(props);
-
-const isMobile = ref(false);
 const open = ref(false);
 
 const borrowerName = computed(() => loan.value?.name ?? '');
@@ -227,13 +223,6 @@ const toggleWhatIsNext = () => {
 	}
 	open.value = !open.value;
 };
-
-onMounted(() => {
-	isMobile.value = document.documentElement.clientWidth < 735;
-	if (!isMobile.value) {
-		open.value = true;
-	}
-});
 </script>
 
 <style lang="postcss" scoped>
diff --git a/src/components/MyKiva/MyKivaHero.vue b/src/components/MyKiva/MyKivaHero.vue
index 7e4f4e5a85..d8fd5017fb 100644
--- a/src/components/MyKiva/MyKivaHero.vue
+++ b/src/components/MyKiva/MyKivaHero.vue
@@ -34,6 +34,7 @@
 				</div>
 			</div>
 			<button
+				:disabled="isLoading"
 				@click="$emit('show-navigation')"
 			>
 				<kv-material-icon
@@ -58,7 +59,11 @@ const props = defineProps({
 	userInfo: {
 		type: Object,
 		default: () => ({}),
-	}
+	},
+	isLoading: {
+		type: Boolean,
+		default: false,
+	},
 });
 
 const { userInfo } = toRefs(props);
diff --git a/src/components/MyKiva/MyKivaNavigation.vue b/src/components/MyKiva/MyKivaNavigation.vue
index 8c60f15894..ae862e67c0 100644
--- a/src/components/MyKiva/MyKivaNavigation.vue
+++ b/src/components/MyKiva/MyKivaNavigation.vue
@@ -160,7 +160,7 @@ const publicId = computed(() => {
 });
 
 const open = ref(false);
-const profileSettingsOptions = ref([
+const profileSettingsOptions = computed(() => [
 	{ link: '/settings/account', text: 'Account' },
 	{ link: '/settings/security', text: 'Security and login' },
 	{ link: '/settings/email', text: 'Email' },
diff --git a/src/pages/Portfolio/MyKiva/MyKivaPage.vue b/src/pages/Portfolio/MyKiva/MyKivaPage.vue
index 27fa877dcd..b2044b0026 100644
--- a/src/pages/Portfolio/MyKiva/MyKivaPage.vue
+++ b/src/pages/Portfolio/MyKiva/MyKivaPage.vue
@@ -8,6 +8,7 @@
 		/>
 		<MyKivaHero
 			:user-info="userInfo"
+			:is-loading="isLoading"
 			@show-navigation="handleShowNavigation"
 		/>
 		<MyKivaProfile