diff --git a/app/components/ActionButton.tsx b/app/components/ActionButton.tsx
index d5468ea05f..ec2a483dd0 100644
--- a/app/components/ActionButton.tsx
+++ b/app/components/ActionButton.tsx
@@ -30,20 +30,20 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
     });
     const isMounted = useIsMounted();
     const [executing, setExecuting] = React.useState(false);
-    const disabled = rest.disabled;
 
     if (!actionContext || !action) {
       return <button {...rest} ref={ref} />;
     }
 
-    if (
-      action.visible &&
-      !resolve<boolean>(action.visible, actionContext) &&
-      hideOnActionDisabled
-    ) {
+    const actionIsDisabled =
+      action.visible && !resolve<boolean>(action.visible, actionContext);
+
+    if (actionIsDisabled && hideOnActionDisabled) {
       return null;
     }
 
+    const disabled = rest.disabled || actionIsDisabled;
+
     const label =
       rest["aria-label"] ??
       (typeof action.name === "function"
diff --git a/app/scenes/Trash/index.tsx b/app/scenes/Trash/index.tsx
index fe0cb096b8..d2194fc525 100644
--- a/app/scenes/Trash/index.tsx
+++ b/app/scenes/Trash/index.tsx
@@ -20,7 +20,11 @@ function Trash() {
       title={t("Trash")}
       actions={
         documents.deleted.length > 0 && (
-          <Button neutral action={permanentlyDeleteDocumentsInTrash}>
+          <Button
+            neutral
+            action={permanentlyDeleteDocumentsInTrash}
+            hideOnActionDisabled
+          >
             {t("Empty trash")}
           </Button>
         )