diff --git a/web/src/compositions/useRouteBackOrDefault.ts b/web/src/compositions/useRouteBackOrDefault.ts
new file mode 100644
index 000000000..476ad956a
--- /dev/null
+++ b/web/src/compositions/useRouteBackOrDefault.ts
@@ -0,0 +1,14 @@
+import { RouteLocationRaw, useRouter } from 'vue-router';
+
+export function useRouteBackOrDefault(to: RouteLocationRaw) {
+  const router = useRouter();
+
+  return () => {
+    // TODO: use history navigation once we have found a solution for filtering external history entries
+    // if (window.history.length > 2) {
+    //   router.back();
+    // } else {
+    router.replace(to);
+    // }
+  };
+}
diff --git a/web/src/views/repo/RepoBuild.vue b/web/src/views/repo/RepoBuild.vue
index 6002b4e2f..832b1e1e7 100644
--- a/web/src/views/repo/RepoBuild.vue
+++ b/web/src/views/repo/RepoBuild.vue
@@ -1,7 +1,7 @@
 <template>
   <template v-if="build && repo">
     <FluidContainer class="flex border-b mb-4 items-center dark:border-gray-600 min-w-0">
-      <IconButton icon="back" class="flex-shrink-0" @click="$router.back()" />
+      <IconButton icon="back" class="flex-shrink-0" @click="goBack" />
       <h1 class="text-xl ml-2 text-gray-500 whitespace-nowrap overflow-hidden overflow-ellipsis">
         Pipeline #{{ buildId }} - {{ message }}
       </h1>
@@ -83,6 +83,7 @@ import { useAsyncAction } from '~/compositions/useAsyncAction';
 import useBuild from '~/compositions/useBuild';
 import { useFavicon } from '~/compositions/useFavicon';
 import useNotifications from '~/compositions/useNotifications';
+import { useRouteBackOrDefault } from '~/compositions/useRouteBackOrDefault';
 import { Repo, RepoPermissions } from '~/lib/api/types';
 import BuildStore from '~/store/builds';
 import { findProc } from '~/utils/helpers';
@@ -249,6 +250,7 @@ export default defineComponent({
       restartBuild,
       approveBuild,
       declineBuild,
+      goBack: useRouteBackOrDefault({ name: 'repo' }),
     };
   },
 });
diff --git a/web/src/views/repo/RepoSettings.vue b/web/src/views/repo/RepoSettings.vue
index 9308fedb2..f26587176 100644
--- a/web/src/views/repo/RepoSettings.vue
+++ b/web/src/views/repo/RepoSettings.vue
@@ -1,7 +1,7 @@
 <template>
   <FluidContainer>
     <div class="flex border-b items-center pb-4 mb-4 dark:border-gray-600">
-      <IconButton icon="back" @click="$router.back()" />
+      <IconButton icon="back" @click="goBack" />
       <h1 class="text-xl ml-2 text-gray-500">Settings</h1>
     </div>
 
@@ -39,6 +39,7 @@ import SecretsTab from '~/components/repo/settings/SecretsTab.vue';
 import Tab from '~/components/tabs/Tab.vue';
 import Tabs from '~/components/tabs/Tabs.vue';
 import useNotifications from '~/compositions/useNotifications';
+import { useRouteBackOrDefault } from '~/compositions/useRouteBackOrDefault';
 import { RepoPermissions } from '~/lib/api/types';
 
 export default defineComponent({
@@ -71,6 +72,10 @@ export default defineComponent({
         await router.replace({ name: 'home' });
       }
     });
+
+    return {
+      goBack: useRouteBackOrDefault({ name: 'repo' }),
+    };
   },
 });
 </script>