diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index 629ec018..b3361ad2 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -590,10 +590,12 @@ thunar_g_app_info_launch (GAppInfo          *info,
           file = thunar_file_get (lp->data, NULL);
           if (file != NULL)
             {
+              gpointer *do_not_update_last_used = g_object_get_data (G_OBJECT (info), "do_not_update_last_used");
               content_type = thunar_file_get_content_type (file);
 
               /* emit "changed" on the file if we successfully changed the last used application */
-              if (g_app_info_set_as_last_used_for_type (info, content_type, NULL))
+              if (do_not_update_last_used == NULL &&
+                  g_app_info_set_as_last_used_for_type (info, content_type, NULL))
                 thunar_file_changed (file);
 
               g_object_unref (file);
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index b34b491b..f8505693 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -1818,6 +1818,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
               action = gtk_action_new (name, label, tooltip, NULL);
               gtk_action_set_gicon (action, g_app_info_get_icon (lp->data));
               g_object_set_qdata_full (G_OBJECT (action), thunar_launcher_handler_quark, lp->data, g_object_unref);
+              g_object_set_data (lp->data, "do_not_update_last_used", GUINT_TO_POINTER (1));
               g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_launcher_action_open), launcher);
               gtk_action_group_add_action (launcher->action_group, action);
               gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,