diff --git a/public/locales/en-US/common.json b/public/locales/en-US/common.json
index 63823da6..2fa82084 100644
--- a/public/locales/en-US/common.json
+++ b/public/locales/en-US/common.json
@@ -25,6 +25,7 @@
   },
   "battlesuits-list": {
     "heading": "Battlesuits",
+    "filters": "Filters",
     "filter-by-features": "Filter by Features",
     "filter-by-valkyries": "Filter by Valkyries"
   },
diff --git a/public/locales/ko-KR/common.json b/public/locales/ko-KR/common.json
index 1c1fa118..3b8749f5 100644
--- a/public/locales/ko-KR/common.json
+++ b/public/locales/ko-KR/common.json
@@ -20,6 +20,7 @@
   },
   "battlesuits-list": {
     "heading": "발키리",
+    "filters": "필터",
     "filter-by-features": "특성 필터",
     "filter-by-valkyries": "발키리 필터"
   },
diff --git a/src/components/atoms/FilterButton.tsx b/src/components/atoms/FilterButton.tsx
index 5df106cb..ada005f3 100644
--- a/src/components/atoms/FilterButton.tsx
+++ b/src/components/atoms/FilterButton.tsx
@@ -1,5 +1,6 @@
 /** @jsxImportSource theme-ui */
-import PageLink from './PageLink'
+import { useRouter } from 'next/router'
+import { Link } from 'theme-ui'
 import SquareImageBox from './SquareImageBox'
 
 interface FilterButtonProps {
@@ -8,6 +9,7 @@ interface FilterButtonProps {
   label: string
   value: string
   m?: string | number
+  close?: () => void
 }
 
 const FilterButton = ({
@@ -16,17 +18,25 @@ const FilterButton = ({
   label,
   value,
   m,
+  close,
 }: FilterButtonProps) => {
+  const { push } = useRouter()
   return (
-    <PageLink
-      href={{ query: { filter: value } }}
-      shallow={true}
+    <Link
+      href={`?filter=${value}`}
       m={m}
       py={1}
       px={2}
       className={active ? 'active' : ''}
       sx={{ display: 'flex' }}
       variant='buttons.primary'
+      onClick={(event) => {
+        event.preventDefault()
+        if (close != null) {
+          close()
+        }
+        push({ query: { filter: value } }, undefined, { shallow: true })
+      }}
     >
       {icon != null && (
         <SquareImageBox
@@ -37,7 +47,7 @@ const FilterButton = ({
         />
       )}
       {label}
-    </PageLink>
+    </Link>
   )
 }
 
diff --git a/src/pages/honkai3rd/battlesuits/index.tsx b/src/pages/honkai3rd/battlesuits/index.tsx
index 8d679ec8..352163f0 100644
--- a/src/pages/honkai3rd/battlesuits/index.tsx
+++ b/src/pages/honkai3rd/battlesuits/index.tsx
@@ -1,7 +1,7 @@
 /** @jsxImportSource theme-ui */
-import { Box, Heading, Flex } from '@theme-ui/components'
+import { Box, Heading, Flex, Button } from '@theme-ui/components'
 import { pick } from 'ramda'
-import { useMemo } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import FilterButton from '../../../components/atoms/FilterButton'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
@@ -48,6 +48,11 @@ const valkyrieFilterOptions: {
 const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
   const { query, locale } = useRouter()
   const { t } = useTranslation()
+  const [hiddenFilters, setHiddenFilters] = useState(true)
+
+  const closeFilters = useCallback(() => {
+    setHiddenFilters(true)
+  }, [])
 
   const filter = useMemo(() => {
     if (query.filter == null) {
@@ -87,7 +92,26 @@ const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
 
         <Heading as='h1'>{t('battlesuits-list.heading')}</Heading>
 
-        <Box>
+        <Box sx={{ display: ['block', 'none'], mb: 2 }}>
+          <Button
+            className={hiddenFilters ? '' : 'active'}
+            sx={{ px: 2, py: 1 }}
+            onClick={() => {
+              setHiddenFilters((previousValue) => !previousValue)
+            }}
+          >
+            {t('battlesuits-list.filters')}
+          </Button>
+        </Box>
+        <Box
+          className={hiddenFilters ? 'hidden' : ''}
+          sx={{
+            display: 'block',
+            '&.hidden': {
+              display: ['none', 'block'],
+            },
+          }}
+        >
           <Heading as='h3'>{t('battlesuits-list.filter-by-features')}</Heading>
           <Flex mb={2} sx={{ flexWrap: 'wrap' }}>
             {featureFilterOptions.map(({ value, label, icon, krLabel }) => {
@@ -99,6 +123,7 @@ const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
                   label={translate(locale, { 'ko-KR': krLabel }, label)}
                   icon={icon}
                   m={1}
+                  close={closeFilters}
                 />
               )
             })}
@@ -115,6 +140,7 @@ const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
                   label={translate(locale, { 'ko-KR': krLabel }, label)}
                   icon={icon}
                   m={1}
+                  close={closeFilters}
                 />
               )
             })}