diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index c557465f..34006c8b 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -4566,7 +4566,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   /* update the "Move to Trash" action */
   g_object_set (G_OBJECT (standard_view->priv->action_move_to_trash),
                 "sensitive", (n_selected_files > 0) && trashable,
-                "visible", !trashed && thunar_g_vfs_is_uri_scheme_supported ("trash"),
+                "visible", (!trashed && thunar_g_vfs_is_uri_scheme_supported ("trash") && trashable) || !(!trashable && !show_delete_action && writable),
                 "tooltip", ngettext ("Move the selected file to the Trash",
                                      "Move the selected files to the Trash",
                                      n_selected_files),
@@ -4575,7 +4575,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   /* update the "Delete" action */
   g_object_set (G_OBJECT (standard_view->priv->action_delete),
                 "sensitive", (n_selected_files > 0) && writable,
-                "visible", trashed || !thunar_g_vfs_is_uri_scheme_supported ("trash") || show_delete_action,
+                "visible", trashed || !thunar_g_vfs_is_uri_scheme_supported ("trash") || show_delete_action || (!trashable && !show_delete_action && writable),
                 "tooltip", ngettext ("Permanently delete the selected file",
                                      "Permanently delete the selected files",
                                      n_selected_files),