diff --git a/gtk/gtkfilechoosernativewin32.c b/gtk/gtkfilechoosernativewin32.c
index bfa4dadcf0..01164d357b 100644
--- a/gtk/gtkfilechoosernativewin32.c
+++ b/gtk/gtkfilechoosernativewin32.c
@@ -333,10 +333,9 @@ filechooser_win32_thread_data_free (FilechooserWin32ThreadData *data)
       g_array_free (data->choices_selections, TRUE);
       data->choices_selections = NULL;
     }
-  g_object_unref (data->shortcut_files);
+  g_clear_object (&data->shortcut_files);
   g_slist_free_full (data->files, g_object_unref);
-  if (data->self)
-    g_object_unref (data->self);
+  g_clear_object (&data->self);
   g_free (data->accept_label);
   g_free (data->cancel_label);
   g_free (data->title);