diff --git a/src/components/Articles/Categories/Categories.js b/src/components/Articles/Categories/Categories.js
index 29e38ee..3cf709e 100644
--- a/src/components/Articles/Categories/Categories.js
+++ b/src/components/Articles/Categories/Categories.js
@@ -1,10 +1,17 @@
 import React from 'react';
+import { useLocation } from '@reach/router'
 import { Link } from 'gatsby'
 
-const Categories = ({ children, pathname, setQuery }) => {
+const Categories = ({ children, setQuery = () => null }) => {
+  const { search, pathname } = useLocation()
+
   return (
     <div className="articles-categories">
-      <div className={pathname === `/articles` ? 'tag-item active' : 'tag-item'}>
+      <div className={
+        pathname === `/articles` || (pathname === `/articles/` && search === '')
+        ? 'tag-item active' 
+        : 'tag-item'
+      }>
         <Link onClick={() => setQuery('')} to='/articles'>Все</Link>
       </div>
       {children}
diff --git a/src/components/Articles/Categories/CategoryItem.js b/src/components/Articles/Categories/CategoryItem.js
index 0fa0291..f9c781e 100644
--- a/src/components/Articles/Categories/CategoryItem.js
+++ b/src/components/Articles/Categories/CategoryItem.js
@@ -7,7 +7,7 @@ import slugify from '../../../helpers/slugify'
 const CategoryItem = ({ title }) => {
   const { pathname } = useLocation()
   return (
-    <div className={pathname === `/category/${slugify(title)}` ? 'tag-item active' : 'tag-item'}>
+    <div className={pathname === `/category/${slugify(title)}` || pathname === `/category/${slugify(title)}/` ? 'tag-item active' : 'tag-item'}>
       <Link to={`/category/${slugify(title)}`}>{title}</Link>
     </div>
   )
diff --git a/src/pages/articles.js b/src/pages/articles.js
index 313ea11..9ae7e55 100644
--- a/src/pages/articles.js
+++ b/src/pages/articles.js
@@ -33,7 +33,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => {
 			||	frontmatter.tags.join('').toLowerCase().includes(query.toLowerCase())
 		)
   }, [query])
-  
+
   React.useEffect(() => {
     if (query !== '') setFiltredArticles(filterArticles(allArticles.edges))
   }, [setFiltredArticles, filterArticles, allArticles.edges, query, pathname])
@@ -49,7 +49,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => {
                 <div className="articles-heading">
                   <h1>Статьи</h1>
                 </div>
-                <Categories pathname={pathname} setQuery={setQuery}>
+                <Categories setQuery={setQuery}>
                   {categories.map(({ node }, i) => <CategoryItem key={i} title={node.frontmatter.title} />)}
                 </Categories>
                 <Search allArticles={allArticles.edges} filterArticles={filterArticles} articlesLength={edges.edges.length} resultsLength={filtredArticles.length} query={query} setQuery={setQuery} setFiltredArticles={setFiltredArticles} />