diff --git a/apps/zbugs/src/index.css b/apps/zbugs/src/index.css
index d177623940..9b2c1d57fa 100644
--- a/apps/zbugs/src/index.css
+++ b/apps/zbugs/src/index.css
@@ -290,7 +290,7 @@ textarea.autoResize {
 .sort-control,
 .sort-direction {
   opacity: 0.6;
-  transition: all 0.3s ease-in-out;
+  transition: opacity 0.3s ease-in-out;
 }
 
 .sort-control:hover,
diff --git a/apps/zbugs/src/pages/list/list-page.tsx b/apps/zbugs/src/pages/list/list-page.tsx
index 7fcb7adc4f..81168e837a 100644
--- a/apps/zbugs/src/pages/list/list-page.tsx
+++ b/apps/zbugs/src/pages/list/list-page.tsx
@@ -20,6 +20,7 @@ import {useThrottledCallback} from 'use-debounce';
 import RelativeTime from '../../components/relative-time.js';
 import {useClickOutside} from '../../hooks/use-click-outside.js';
 import {useKeypress} from '../../hooks/use-keypress.js';
+import {Button} from '../../components/button.js';
 
 let firstRowRendered = false;
 const itemSize = 56;
@@ -286,13 +287,13 @@ export default function ListPage() {
         })}
         <Filter onSelect={onFilter} />
         <div className="sort-control-container">
-          <button className="sort-control" onClick={toggleSortField}>
+          <Button className="sort-control" onAction={toggleSortField}>
             {sortField === 'modified' ? 'Modified' : 'Created'}
-          </button>
-          <button
+          </Button>
+          <Button
             className={classNames('sort-direction', sortDirection)}
-            onClick={toggleSortDirection}
-          ></button>
+            onAction={toggleSortDirection}
+          ></Button>
         </div>
       </div>