diff --git a/ChangeLog b/ChangeLog
index c0b5e230e9fd961ede2897dbc2921ae0c3344bb1..7c6b3d53481158c79cba9425637e2da415df289f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-06	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-launcher.c(thunar_launcher_update): Place additional
+	  "Open With" action into a submenu if either more than 2 are available
+	  or the default action for the file is "Execute".
+
 2006-08-06	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-thumb.c
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 20d38385c00ba38f0b528f39b5bc45514fedcae3..52c85161eea02ab81dcd2c9ec872a0ac4e8627eb 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -876,8 +876,10 @@ thunar_launcher_update (ThunarLauncher *launcher)
                         NULL);
         }
 
-      /* place the other applications in the "Open With" submenu if we have more than 2 other applications */
-      if (G_UNLIKELY (g_list_length (applications) > 3))
+      /* place the other applications in the "Open With" submenu if we have more than 2 other applications, or the
+       * default action for the file is "Execute", in which case the "Open With" actions aren't that relevant either
+       */
+      if (G_UNLIKELY (g_list_length (applications) > 2 || n_executables == n_selected_files))
         {
           /* determine the base paths for the actions */
           file_menu_path = "/main-menu/file-menu/placeholder-launcher/open-with-menu/placeholder-applications";