diff --git a/src/gtr-po.h b/src/gtr-po.h
index c710508b904aec34b659dfe459647c5ba89bf8d3..29809cdded3d897b8e56d698082d813df6c25527 100644
--- a/src/gtr-po.h
+++ b/src/gtr-po.h
@@ -81,6 +81,8 @@ typedef enum
   GTR_PO_STATE_MODIFIED
 } GtrPoState;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtrPo, g_object_unref)
+
 /*
  * Public methods
  */
diff --git a/src/translation-memory/gtr-translation-memory-dialog.c b/src/translation-memory/gtr-translation-memory-dialog.c
index 0e88e5d1608ece847b21fb67e406d21ba103b94c..0c1846cb667b03a591243c4ef487acf520383923 100644
--- a/src/translation-memory/gtr-translation-memory-dialog.c
+++ b/src/translation-memory/gtr-translation-memory-dialog.c
@@ -124,7 +124,7 @@ add_to_database (gpointer data_pointer)
       GList *msg_list = NULL;
       GFile *location;
       GError *error = NULL;
-      GtrPo *po;
+      g_autoptr(GtrPo) po = NULL;
 
       po = gtr_po_new ();
       location = (GFile *) l->data;
@@ -136,8 +136,6 @@ add_to_database (gpointer data_pointer)
       msg_list = gtr_po_get_messages (po);
 
       gtr_translation_memory_store_list (data->tm, msg_list);
-
-      g_object_unref (po);
     }
   else
     {