diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 9d27ea63..52abe634 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -5,6 +5,7 @@ import type { CompetenceCertificate } from "@/types";
 import { useCertificateQuery } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 import { getCertificates } from "@/services/competence";
+import { getPreviousRoute } from "@/router/history";
 
 const props = defineProps<{
   courseSlug: string;
@@ -43,11 +44,14 @@ onMounted(async () => {
   <div class="container-large">
     <nav class="py-4">
       <router-link
-        class="btn-text inline-flex items-center pl-0"
-        :to="`/course/${props.courseSlug}/competence/certificates`"
+        :to="
+          getPreviousRoute() || `/course/${props.courseSlug}/competence/certificates`
+        "
+        class="btn-text inline-flex items-center p-0"
+        data-cy="back-button"
       >
-        <it-icon-arrow-left />
-        <span>{{ $t("general.back") }}</span>
+        <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
+        <span class="inline">{{ $t("general.back") }}</span>
       </router-link>
     </nav>
     <div v-if="certificate">