diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx
index 9f038f5c..bd336f2b 100644
--- a/packages/app/src/Pages/Root.tsx
+++ b/packages/app/src/Pages/Root.tsx
@@ -40,8 +40,22 @@ export default function RootPage() {
       data: "/global",
     },
   };
+
+  const tagTabs = tags.item.map((t, idx) => {
+    return { text: `#${t}`, value: idx + 3, data: `/tag/${t}` };
+  });
+  const tabs = [RootTab.Posts, RootTab.PostsAndReplies, RootTab.Global, ...tagTabs];
   const tab = useMemo(() => {
     const pTab = location.pathname.split("/").slice(-1)[0];
+
+    if (location.pathname.startsWith("/tag")) {
+      const selectedTag = tagTabs.find(t => t.text.slice(1) === pTab);
+
+      if (selectedTag) {
+        return selectedTag;
+      }
+    }
+
     switch (pTab) {
       case "conversations": {
         return RootTab.PostsAndReplies;
@@ -64,11 +78,6 @@ export default function RootPage() {
     }
   }, [location]);
 
-  const tagTabs = tags.item.map((t, idx) => {
-    return { text: `#${t}`, value: idx + 3, data: `/tag/${t}` };
-  });
-  const tabs = [RootTab.Posts, RootTab.PostsAndReplies, RootTab.Global, ...tagTabs];
-
   return (
     <>
       <div className="main-content">
diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json
index 707d8806..909a4bc7 100644
--- a/packages/app/src/translations/en.json
+++ b/packages/app/src/translations/en.json
@@ -364,4 +364,4 @@
   "zjJZBd": "You're ready!",
   "zonsdq": "Failed to load LNURL service",
   "zvCDao": "Automatically show latest notes"
-}
\ No newline at end of file
+}