diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue
index a9a5c0ce57..6079c08f05 100644
--- a/src/client/components/modal-page-window.vue
+++ b/src/client/components/modal-page-window.vue
@@ -10,7 +10,9 @@
 			<button class="_button" @click="$refs.modal.close()"><Fa :icon="faTimes"/></button>
 		</div>
 		<div class="body _flat_">
-			<component :is="component" v-bind="props" :ref="changePage"/>
+			<keep-alive>
+				<component :is="component" v-bind="props" :ref="changePage"/>
+			</keep-alive>
 		</div>
 	</div>
 </MkModal>
diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue
index 1613644c87..70676cdaf5 100644
--- a/src/client/components/ui/window.vue
+++ b/src/client/components/ui/window.vue
@@ -395,7 +395,7 @@ export default defineComponent({
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 5000;
+	z-index: 10000; // mk-modalのと同じでなければならない
 
 	&.front {
 		z-index: 11000; // front指定の時は、mk-modalのよりも大きくなければならない
diff --git a/src/client/pages/api-console.vue b/src/client/pages/api-console.vue
index 5321f8e7ce..7deb18afa2 100644
--- a/src/client/pages/api-console.vue
+++ b/src/client/pages/api-console.vue
@@ -1,25 +1,29 @@
 <template>
 <div>
-<section class="_section">
-	<MkInput v-model:value="endpoint" :datalist="endpoints" @update:value="onEndpointChange()">
-		<span>Endpoint</span>
-	</MkInput>
-	<MkTextarea v-model:value="body" code>
-		<span>Params (JSON or JSON5)</span>
-	</MkTextarea>
-	<MkSwitch v-model:value="withCredential">
-		With credential
-	</MkSwitch>
-	<MkButton primary full @click="send" :disabled="sending">
-		<template v-if="sending"><MkEllipsis/></template>
-		<template v-else><Fa :icon="faPaperPlane"/> Send</template>
-	</MkButton>
-</section>
-<section class="_section" v-if="res">
-	<MkTextarea v-model:value="res" code readonly tall>
-		<span>Response</span>
-	</MkTextarea>
-</section>
+	<div class="_root">
+		<div class="_block" style="padding: 24px;">
+			<MkInput v-model:value="endpoint" :datalist="endpoints" @update:value="onEndpointChange()">
+				<span>Endpoint</span>
+			</MkInput>
+			<MkTextarea v-model:value="body" code>
+				<span>Params (JSON or JSON5)</span>
+			</MkTextarea>
+			<MkSwitch v-model:value="withCredential">
+				With credential
+			</MkSwitch>
+			<MkButton primary full @click="send" :disabled="sending">
+				<template v-if="sending"><MkEllipsis/></template>
+				<template v-else><Fa :icon="faPaperPlane"/> Send</template>
+			</MkButton>
+		</div>
+	</div>
+	<div class="_root" v-if="res">
+		<div class="_block" style="padding: 24px;">
+			<MkTextarea v-model:value="res" code readonly tall>
+				<span>Response</span>
+			</MkTextarea>
+		</div>
+	</div>
 </div>
 </template>
 
diff --git a/src/client/pages/settings/index.vue b/src/client/pages/settings/index.vue
index 0387d66ae8..5a21cf2ff3 100644
--- a/src/client/pages/settings/index.vue
+++ b/src/client/pages/settings/index.vue
@@ -148,7 +148,11 @@ export default defineComponent({
 		}, { immediate: true });
 
 		watch(() => props.initialPage, () => {
-			page.value = props.initialPage;
+			if (props.initialPage == null && !narrow.value) {
+				page.value = 'profile';
+			} else {
+				page.value = props.initialPage;
+			}
 		});
 
 		onMounted(() => {