diff --git a/src/components/nav-drawer.js b/src/components/nav-drawer.js
index 6c595afe0ee..a60e1aa5ba8 100644
--- a/src/components/nav-drawer.js
+++ b/src/components/nav-drawer.js
@@ -76,7 +76,19 @@ function NavDrawer() {
 
   return (
     <>
-      <Button aria-label="Menu" aria-expanded={open} onClick={() => setOpen(true)} sx={{ml: 3}}>
+      <Button
+        aria-label="Menu"
+        aria-expanded={open}
+        onClick={() => setOpen(true)}
+        sx={{
+          ml: 3,
+          '&:focus-visible': {
+            outline: '2px solid',
+            outlineColor: '-webkit-focus-ring-color',
+            outlineOffset: '1px',
+          },
+        }}
+      >
         <ThreeBarsIcon />
       </Button>
       <LightTheme as={Drawer} isOpen={open} onDismiss={() => setOpen(false)}>
diff --git a/src/components/search.js b/src/components/search.js
index 2028e73a8f1..6dbaa47bd6d 100644
--- a/src/components/search.js
+++ b/src/components/search.js
@@ -113,7 +113,18 @@ export const Mobile = ({
   return (
     <>
       {!isMobileSearchOpen && (
-        <Button aria-label="Search" aria-expanded={isMobileSearchOpen} onClick={handleSearchToggle}>
+        <Button
+          aria-label="Search"
+          aria-expanded={isMobileSearchOpen}
+          onClick={handleSearchToggle}
+          sx={{
+            '&:focus-visible': {
+              outline: '2px solid',
+              outlineColor: '-webkit-focus-ring-color',
+              outlineOffset: '1px',
+            },
+          }}
+        >
           <SearchIcon />
         </Button>
       )}
diff --git a/src/components/table-of-contents.js b/src/components/table-of-contents.js
index d8abb5972c5..ec358a17ef3 100644
--- a/src/components/table-of-contents.js
+++ b/src/components/table-of-contents.js
@@ -53,6 +53,11 @@ export const Mobile = withTableOfContents(({items}) => {
             borderBottomWidth: open ? 1 : 0,
             borderBottomLeftRadius: open ? 0 : 2,
             borderBottomRightRadius: open ? 0 : 2,
+            '&:focus-visible': {
+              outline: '2px solid',
+              outlineColor: '-webkit-focus-ring-color',
+              outlineOffset: '1px',
+            },
           }}
           leadingIcon={open ? ChevronDownIcon : ChevronRightIcon}
         >
diff --git a/src/components/variant-select.js b/src/components/variant-select.js
index a8c614fbcb5..bb7ba9ca8e5 100644
--- a/src/components/variant-select.js
+++ b/src/components/variant-select.js
@@ -53,7 +53,17 @@ const VariantMenu = ({title, latest, current, prerelease, legacy}) => {
         Select CLI Version:
       </Box>
       <ActionMenu anchorRef={anchorRef} open={open} onOpenChange={setOpen}>
-        <ActionMenu.Button aria-describedby={labelId} sx={{width: ['100%', null, 'auto']}}>
+        <ActionMenu.Button
+          aria-describedby={labelId}
+          sx={{
+            width: ['100%', null, 'auto'],
+            '&:focus-visible': {
+              outline: '2px solid',
+              outlineColor: '-webkit-focus-ring-color',
+              outlineOffset: '1px',
+            },
+          }}
+        >
           {title}
         </ActionMenu.Button>
         <StyledOverlay width="auto" onEscape={() => setOpen(false)}>
diff --git a/src/mdx/code.js b/src/mdx/code.js
index 05880b4d535..083051aa5f9 100644
--- a/src/mdx/code.js
+++ b/src/mdx/code.js
@@ -36,7 +36,7 @@ const ClipboardCopy = ({value, ...props}) => {
         '&:focus-visible': {
           outline: '2px solid',
           outlineColor: '-webkit-focus-ring-color',
-          outlineOffset: '2px',
+          outlineOffset: '1px',
         },
       }}
     >