diff --git a/src/components/Back/Back.astro b/src/components/Back/Back.astro
index c2628e93..d02dab2f 100644
--- a/src/components/Back/Back.astro
+++ b/src/components/Back/Back.astro
@@ -1,8 +1,33 @@
 ---
 const { href, label } = Astro.props;
 import "./Back.scss";
+
+const usedLabel = label ? label : "Back";
 ---
 
-<a class="Back" href={href}
-  ><i class="mdi mdi-keyboard-backspace"></i> {label}</a
->
+<div class="Back" onclick={`handleBackClick('${href}')`}>
+  <i class="mdi mdi-keyboard-backspace"></i>
+  {usedLabel}
+</div>
+
+<script>
+  document.addEventListener("DOMContentLoaded", function () {
+    function handleBackClick(href: string) {
+      const previousPageURL = document.referrer;
+      const currentPageRoot = window.origin;
+
+      if (previousPageURL.includes(currentPageRoot)) {
+        if (href != "undefined") {
+          window.location.href = href;
+        } else {
+          window.history.back();
+        }
+      } else {
+        window.location.href = "/";
+      }
+    }
+
+    // Make sure handleBackClick is available globally
+    window.handleBackClick = handleBackClick;
+  });
+</script>
diff --git a/src/pages/practice/tag/[tag].astro b/src/pages/practice/tag/[tag].astro
index a77c7044..bdcee49b 100644
--- a/src/pages/practice/tag/[tag].astro
+++ b/src/pages/practice/tag/[tag].astro
@@ -112,7 +112,7 @@ const tabTitle = tag
 <Layout title={tabTitle}>
   <div class="Question__bar">
     <div>
-      <Back href={`/questions/${randomQuestion.data.path}`} label="Back" />
+      <Back />
     </div>
   </div>
 
diff --git a/src/pages/questions/[...path].astro b/src/pages/questions/[...path].astro
index 9366aa67..1ddf8005 100644
--- a/src/pages/questions/[...path].astro
+++ b/src/pages/questions/[...path].astro
@@ -52,7 +52,7 @@ const title = formatString(path);
 
 <Layout title={title + " Question"}>
   <div class="Question__bar">
-    <div><Back href={`/evaluations`} label="Evaluations" /></div>
+    <div><Back /></div>
   </div>
   <h1>{title}</h1>
   <Content />
diff --git a/src/pages/questions/solution/[...path].astro b/src/pages/questions/solution/[...path].astro
index 032212b4..c3339002 100644
--- a/src/pages/questions/solution/[...path].astro
+++ b/src/pages/questions/solution/[...path].astro
@@ -44,7 +44,7 @@ const question = await loadQuestion();
 
 <Layout title="Solution">
   <div class="Question__bar">
-    <div><Back href={`/questions/${path}`} label="Back" /></div>
+    <div><Back /></div>
   </div>
   <Content />
   <div>