diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 198d7d734ddbc69b5d23344604396c7fa39f8bf2..09321458073dde8834064c0fde1a4a26d6b7db87 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -2845,6 +2845,13 @@ thunar_launcher_append_open_section (ThunarLauncher *launcher,
       g_free (label_text);
     }
 
+  if (launcher->n_files_to_process == launcher->n_directories_to_process && launcher->n_directories_to_process >= 1)
+    {
+      if (support_tabs)
+        thunar_launcher_append_menu_item (launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_OPEN_IN_TAB, FALSE);
+      thunar_launcher_append_menu_item (launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_OPEN_IN_WINDOW, FALSE);
+    }
+
   if (G_LIKELY (applications != NULL))
     {
       menu_item = xfce_gtk_menu_item_new (_("Open With"),
@@ -2854,13 +2861,6 @@ thunar_launcher_append_open_section (ThunarLauncher *launcher,
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
     }
 
-  if (launcher->n_files_to_process == launcher->n_directories_to_process && launcher->n_directories_to_process >= 1)
-    {
-      if (support_tabs)
-        thunar_launcher_append_menu_item (launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_OPEN_IN_TAB, FALSE);
-      thunar_launcher_append_menu_item (launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_OPEN_IN_WINDOW, FALSE);
-    }
-
   g_list_free_full (applications, g_object_unref);
   return TRUE;
 }
diff --git a/thunar/thunar-menu.c b/thunar/thunar-menu.c
index fabd62400dda60773d3913e93927e968955a4d58..bbf6e8fd5073447b7eeb0c2bfa738dfc7a655d9c 100644
--- a/thunar/thunar-menu.c
+++ b/thunar/thunar-menu.c
@@ -253,18 +253,6 @@ thunar_menu_add_sections (ThunarMenu         *menu,
 
   _thunar_return_val_if_fail (THUNAR_IS_MENU (menu), FALSE);
 
-  if (menu_sections & THUNAR_MENU_SECTION_OPEN)
-    {
-      if (thunar_launcher_append_open_section (menu->launcher, GTK_MENU_SHELL (menu), !menu->tab_support_disabled, !menu->change_directory_support_disabled, menu->force_section_open))
-         xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
-    }
-
-  if (menu_sections & THUNAR_MENU_SECTION_SENDTO)
-    {
-      item_added = thunar_launcher_append_menu_item (menu->launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_SENDTO_MENU, FALSE) != NULL;
-      if (item_added)
-         xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
-    }
   if (menu_sections & THUNAR_MENU_SECTION_CREATE_NEW_FILES)
     {
       item_added = FALSE;
@@ -276,6 +264,19 @@ thunar_menu_add_sections (ThunarMenu         *menu,
       if (item_added)
          xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
     }
+
+  if (menu_sections & THUNAR_MENU_SECTION_OPEN)
+    {
+      if (thunar_launcher_append_open_section (menu->launcher, GTK_MENU_SHELL (menu), !menu->tab_support_disabled, !menu->change_directory_support_disabled, menu->force_section_open))
+         xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
+    }
+
+  if (menu_sections & THUNAR_MENU_SECTION_SENDTO)
+    {
+      if (thunar_launcher_append_menu_item (menu->launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_SENDTO_MENU, FALSE) != NULL)
+         xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
+    }
+
   item_added = FALSE;
   if (menu_sections & THUNAR_MENU_SECTION_CUT)
     item_added |= (thunar_launcher_append_menu_item (menu->launcher, GTK_MENU_SHELL (menu), THUNAR_LAUNCHER_ACTION_CUT, force) != NULL);