diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index a7aa0a3c1a7176de8cb8a919bb011d091f7888da..c9881bfeb09f4f66c4b2b5bb45217b8c9ea28753 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -2115,10 +2115,8 @@ thunar_launcher_action_create_folder (ThunarLauncher *launcher)
   gchar             *name;
 
   _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
-  _thunar_return_if_fail (launcher->single_folder_selected);
-  _thunar_return_if_fail (launcher->single_folder != NULL);
 
-  if (thunar_file_is_trashed (launcher->single_folder))
+  if (thunar_file_is_trashed (launcher->current_directory))
     return;
 
   /* ask the user to enter a name for the new folder */
@@ -2158,10 +2156,8 @@ thunar_launcher_action_create_document (ThunarLauncher *launcher,
   ThunarFile        *template_file;
 
   _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
-  _thunar_return_if_fail (launcher->single_folder_selected);
-  _thunar_return_if_fail (launcher->single_folder != NULL);
 
-  if (thunar_file_is_trashed (launcher->single_folder))
+  if (thunar_file_is_trashed (launcher->current_directory))
     return;
 
   template_file = g_object_get_qdata (G_OBJECT (menu_item), thunar_launcher_file_quark);