diff --git a/apps/www/pages/blog.tsx b/apps/www/pages/blog.tsx
index 75537732c6a..e5a4e1740c8 100644
--- a/apps/www/pages/blog.tsx
+++ b/apps/www/pages/blog.tsx
@@ -14,6 +14,7 @@ import DefaultLayout from '~/components/Layouts/Default'
 import { Tabs } from 'ui'
 import PostTypes from '~/types/post'
 import BlogListItem from '~/components/Blog/BlogListItem'
+import { useParams } from '~/hooks/useParams'
 
 export async function getStaticProps() {
   const allPostsData = getSortedPosts('_blog', undefined, undefined, '** BLOG PAGE **')
@@ -37,6 +38,9 @@ export async function getStaticProps() {
     }
   })
 
+  // Append 'all' category here
+  categories.unshift('all')
+
   return {
     props: {
       blogs: allPostsData,
@@ -46,6 +50,7 @@ export async function getStaticProps() {
 }
 
 function Blog(props: any) {
+  const tag = useParams()?.tag
   const [category, setCategory] = useState('all')
   const [blogs, setBlogs] = useState(props.blogs)
 
@@ -57,6 +62,13 @@ function Blog(props: any) {
     const shiftedBlogs = [...props.blogs]
     shiftedBlogs.shift()
 
+    if (category === 'all') {
+      router.replace('/blog', undefined, { shallow: true, scroll: false })
+    } else {
+      router.query.tag = category
+      router.replace(router, undefined, { shallow: true, scroll: false })
+    }
+
     setBlogs(
       category === 'all'
         ? shiftedBlogs
@@ -68,11 +80,11 @@ function Blog(props: any) {
   }, [category])
 
   useEffect(() => {
-    return props.categories.unshift('all')
-  }, [])
+    if (router.isReady && tag && tag !== 'all') {
+      setCategory(tag)
+    }
+  }, [tag, router.isReady])
 
-  // append 'all' category
-  // const categories = props.categories.push('all')
   const meta_title = 'Supabase Blog: Open Source Firebase alternative Blog'
   const meta_description = 'Get all your Supabase News on the Supabase blog.'
 
@@ -116,9 +128,15 @@ function Blog(props: any) {
             <div className="mx-auto ">
               <div className="grid grid-cols-12">
                 <div className="col-span-12 lg:col-span-12">
-                  <Tabs scrollable size="medium" onChange={setCategory} defaultActiveId={'all'}>
-                    {props.categories.map((categoryId: string) => (
-                      <Tabs.Panel id={categoryId} key={categoryId} label={categoryId} />
+                  <Tabs
+                    scrollable
+                    size="medium"
+                    onChange={setCategory}
+                    defaultActiveId={'all'}
+                    activeId={category}
+                  >
+                    {props.categories.map((tag: string) => (
+                      <Tabs.Panel id={tag} key={tag} label={tag} />
                     ))}
                   </Tabs>
                 </div>