diff --git a/src/components/demo-tab.tsx b/src/components/demo-tab.tsx
index 74ebaf6d..58174607 100644
--- a/src/components/demo-tab.tsx
+++ b/src/components/demo-tab.tsx
@@ -15,7 +15,7 @@ export default function DemoTab({ id, code, component, defaultTab = "preview" }:
             <TabsList className="w-full rounded-none justify-start">
                 <TabsTrigger value="preview">Preview</TabsTrigger>
                 <TabsTrigger value="code">Code</TabsTrigger>
-                <TabsTrigger value="" className="w-full pointer-events-none"></TabsTrigger>
+                <TabsTrigger value="" className="w-full pointer-events-none" aria-hidden="true" tabIndex={-1}></TabsTrigger>
 
             </TabsList>
             <TabsContent value="preview" className="min-h-[200px] p-8 bg-subtle-bg flex items-center justify-center rounded-b-md">
diff --git a/src/components/layout/topbar.tsx b/src/components/layout/topbar.tsx
index 583d4001..b0bfd80c 100644
--- a/src/components/layout/topbar.tsx
+++ b/src/components/layout/topbar.tsx
@@ -372,7 +372,7 @@ export default function TopBar() {
           <div className="lg:hidden">
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
-                <Button variant="ghost" size="icon">
+                <Button variant="ghost" size="icon" aria-label="Open navigation menu">
                   <Icon path={mdiMenu} size={1} />
                 </Button>
               </DropdownMenuTrigger>
@@ -546,12 +546,13 @@ export default function TopBar() {
               href={externalLinks?.Block_github || ""}
               target="_blank"
               rel="noopener noreferrer"
+              aria-label="View GitHub repository"
             >
               <Icon path={mdiGithub} size={1} />
             </a>
           </Button>
 
-          <Button variant="ghost" size="icon" onClick={toggleDarkMode} className="hover:bg-muted active:bg-muted">
+          <Button variant="ghost" size="icon" onClick={toggleDarkMode} className="hover:bg-muted active:bg-muted" aria-label={isDark ? "Switch to light mode" : "Switch to dark mode"}>
             <Icon path={mdiCircleHalfFull} size={1} />
           </Button>
         </div>