diff --git a/src/components/ArticlePost/ArticlePost.astro b/src/components/ArticlePost/ArticlePost.astro
index 844456d..e2dd9c9 100644
--- a/src/components/ArticlePost/ArticlePost.astro
+++ b/src/components/ArticlePost/ArticlePost.astro
@@ -3,6 +3,7 @@ import { createDateFormatter } from "@root/utils";
 import { Image } from "@astrojs/image/components";
 import ArticleComments from "@components/ArticleComments";
 import "./ArticlePost.scss";
+import TranslatedLink from "../TranslatedLink";
 
 export type Props = {
 	data: ArticleType;
@@ -20,7 +21,7 @@ const { title, tags, author, published_at } = data;
 				{
 					tags.map((tag) => (
 						<li>
-							<a href={`/articles/?tags=${tag.toLocaleLowerCase()}`}>{`${tag}${tags.at(-1) === tag ? "" : ","}`}</a>
+							<TranslatedLink to={`/articles/?tags=${tag.toLocaleLowerCase()}`}>{`${tag}${tags.at(-1) === tag ? "" : ","}`}</TranslatedLink>
 						</li>
 					))
 				}
diff --git a/src/components/LanguageSelect/LanguageSelect.astro b/src/components/LanguageSelect/LanguageSelect.astro
index 1169939..2ef2e6c 100644
--- a/src/components/LanguageSelect/LanguageSelect.astro
+++ b/src/components/LanguageSelect/LanguageSelect.astro
@@ -52,6 +52,12 @@ const lang = getLanguageFromURL(Astro.url.pathname);
 		const pathname = window.location.pathname;
 		const url = newLang === DEFAULT_LANGUAGE ? pathname.slice(3) : `${newLang}${pathname}`;
 
+		/* Move user to articles page with new language */
+		if (window.location.pathname.includes("/blog/")) {
+			window.location.pathname = `${newLang === DEFAULT_LANGUAGE ? "" : newLang + "/"}` + "articles/";
+			return;
+		}
+
 		window.location.pathname = url;
 	};