diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 788ab2b503..d06ee831a9 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -107,7 +107,6 @@ import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import { uploadFile, uploads } from '@/scripts/upload.js';
 import { claimAchievement } from '@/scripts/achievements.js';
-import { mainRouter, useRouter } from '@/router.js';
 
 const props = withDefaults(defineProps<{
 	initialFolder?: Misskey.entities.DriveFolder;
@@ -154,7 +153,6 @@ const fetching = ref(true);
 const ilFilesObserver = new IntersectionObserver(
 	(entries) => entries.some((entry) => entry.isIntersecting) && !fetching.value && moreFiles.value && fetchMoreFiles(),
 );
-const router = useRouter();
 
 watch(folder, () => emit('cd', folder.value));
 
@@ -431,15 +429,9 @@ function chooseFolder(folderToChoose: Misskey.entities.DriveFolder) {
 function move(target?: Misskey.entities.DriveFolder) {
 	if (!target) {
 		goRoot();
-		// メインルーターならURLだけ書き換え
-		if (router === mainRouter) history.pushState({}, '', '/my/drive/');
 		return;
 	} else if (typeof target === 'object') {
 		target = target.id;
-		// メインルーターならURLだけ書き換え
-		if (router === mainRouter) {
-			history.pushState({}, '', `/my/drive/folder/${target}`);
-		}
 	}
 
 	fetching.value = true;
diff --git a/packages/frontend/src/pages/drive.vue b/packages/frontend/src/pages/drive.vue
index d613264908..115c295ff0 100644
--- a/packages/frontend/src/pages/drive.vue
+++ b/packages/frontend/src/pages/drive.vue
@@ -5,15 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div>
-	<XDrive ref="drive" :initialFolder="props.folder" @cd="x => folder = x"/>
+	<XDrive ref="drive" :initialFolder="props.folder" @cd="cd"/>
 </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onActivated, onDeactivated } from 'vue';
+import { computed, onActivated } from 'vue';
 import XDrive from '@/components/MkDrive.vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { mainRouter, useRouter } from '@/router.js';
 
 const props = withDefaults(defineProps<{
   folder?: string;
@@ -23,12 +24,27 @@ const props = withDefaults(defineProps<{
 
 let folder = $ref(null);
 
-// 別のルートから飛んできたらそれはルートディレクトリを開く
 let drive = $ref(null);
+
+// 別のルートから飛んできたらそれはルートディレクトリを開く
 onActivated(() => {
 	if (drive) drive.goRoot();
 });
 
+const router = useRouter();
+
+function cd(x) {
+	folder = x;
+	// メインルーターならURLだけ書き換え
+	if (router === mainRouter) {
+		if (folder === null) {
+			history.pushState({}, '', '/my/drive/');
+		} else {
+			history.pushState({}, '', `/my/drive/folder/${folder.id}`);
+		}
+	}
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);