diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index ae3229aa..09e870cb 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -43,7 +43,8 @@ const scopes: Ref<string[]> = ref([]);
 const scopeNamesToRequest: Ref<string[]> = ref([]);
 
 toolbar.setup({
-	backUrl: '/apps',
+	backUrl: undefined,
+	backable: true,
 });
 
 const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
@@ -144,7 +145,12 @@ const openApp = async (data: ServiceData) => {
 	}
 
 	url.value = new URL(data.link);
-	toolbar.title = data.name ?? 'Ошибка';
+
+	toolbar.setup({
+		title: data.name ?? 'Ошибка',
+		backUrl: undefined,
+		backable: true,
+	});
 
 	scopes.value = data.scopes ? data.scopes : [];
 
diff --git a/src/views/timetable/room/TimetableRoomView.vue b/src/views/timetable/room/TimetableRoomView.vue
index d750681a..c2838cc1 100644
--- a/src/views/timetable/room/TimetableRoomView.vue
+++ b/src/views/timetable/room/TimetableRoomView.vue
@@ -12,14 +12,14 @@ const toolbar = useToolbar();
 
 toolbar.setup({
 	title: 'Аудитория',
-	backUrl:
-		router.options.history.state.back &&
-		router.options.history.state.back.toString().startsWith('/timetable/event')
-			? undefined
-			: '/timetable',
 	backable: true,
+	backUrl: undefined,
 	share: true,
 });
+
+const goToMap = () => {
+	router.push('/apps/2');
+};
 </script>
 
 <template>
@@ -28,19 +28,21 @@ toolbar.setup({
 			<Suspense>
 				<AsyncRoomInfo :id="+route.params.id" />
 
-				<template #fallback> <FullscreenLoader /> </template>
+				<template #fallback>
+					<FullscreenLoader />
+				</template>
 			</Suspense>
 		</section>
 
 		<section class="section">
 			<h3 class="h3">Карта этажа</h3>
 
-			<RouterLink to="/apps/2" class="map">
+			<div class="map" @click="goToMap">
 				<span class="text">
 					Посмотреть на карте
 					<v-icon icon="open_in_new" />
 				</span>
-			</RouterLink>
+			</div>
 		</section>
 
 		<section class="section">
@@ -49,7 +51,9 @@ toolbar.setup({
 			</p>
 			<Suspense>
 				<AsyncRoomSchedule :id="+route.params.id" />
-				<template #fallback><FullscreenLoader /></template>
+				<template #fallback>
+					<FullscreenLoader />
+				</template>
 			</Suspense>
 		</section>
 	</IrdomLayout>
@@ -79,6 +83,7 @@ toolbar.setup({
 	justify-content: center;
 	align-items: center;
 	text-decoration: none;
+	cursor: pointer;
 }
 
 .text {