diff --git a/src/components/titlebar-element.vue b/src/components/titlebar-element.vue
index 7a1a711..27bd6cd 100644
--- a/src/components/titlebar-element.vue
+++ b/src/components/titlebar-element.vue
@@ -1,17 +1,28 @@
 <script setup>
 import MenuIcon from "./icons/menu-icon.vue";
 import { computed } from "vue";
-import { useRoute, RouterLink } from "vue-router";
+import { useRoute, useRouter, RouterLink } from "vue-router";
+import { lastRoute } from "../store";
 
 const route = useRoute();
+const router = useRouter();
 const routeName = computed(() => route.name);
+function goBack() {
+  if (routeName.value != "Settings") return;
+  if (lastRoute.value.name) router.go(-1);
+  else router.push("/timetable");
+}
 </script>
 
 <template>
   <div class="titlebar">
     <span class="title">{{ routeName }}</span>
     <div class="settings">
-      <RouterLink to="/settings" v-show="$route.name != 'Login'">
+      <RouterLink
+        to="/settings"
+        v-show="$route.name != 'Login'"
+        @click="goBack()"
+      >
         <MenuIcon />
       </RouterLink>
     </div>
diff --git a/src/router/index.js b/src/router/index.js
index b3a4049..555f74f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,5 @@
 import { createRouter, createWebHistory } from "vue-router";
+import { lastRoute } from "../store";
 import TimetableView from "../views/TimetableView.vue";
 import SubstitutionView from "../views/SubstitutionView.vue";
 import HistoryView from "../views/HistoryView.vue";
@@ -40,4 +41,9 @@ const router = createRouter({
   ],
 });
 
+router.beforeEach((_to, from) => {
+  lastRoute.value = from;
+  return true;
+});
+
 export default router;
diff --git a/src/store.js b/src/store.js
index 6c5588a..0a9ddc4 100644
--- a/src/store.js
+++ b/src/store.js
@@ -2,6 +2,8 @@ import { computed } from "@vue/reactivity";
 import { ref, watch } from "vue";
 import router from "./router";
 
+export const lastRoute = ref();
+
 export const substitutionFilter = ref(
   localStorage.getItem("substitutionFilter") || "all"
 );