diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8a02bc0653a684f84ad9be864b2190d40b0fcbb9..44e0d4ea066459321b44e6dc94c4291b01a26e72 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,7 +46,6 @@ thunar/thunar-list-model.c
 thunar/thunar-location-bar.c
 thunar/thunar-location-button.c
 thunar/thunar-location-buttons.c
-thunar/thunar-location-dialog.c
 thunar/thunar-location-entry.c
 thunar/thunar-notify.c
 thunar/thunar-misc-jobs.c
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 00f6bd63bfc302fab85209e1a6dfb2f4be29922f..86cd09d13fc6be6339d89095329d719b7b005530 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -377,7 +377,6 @@ EXTRA_DIST =								\
 	thunar-dbus-service-infos.xml					\
 	thunar-details-view-ui.xml					\
 	thunar-launcher-ui.xml						\
-	thunar-location-buttons-ui.xml					\
 	thunar-marshal.list						\
 	thunar-renamer-dialog-ui.xml					\
 	thunar-standard-view-ui.xml					\
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 229b2891c254053eb1e3304267f62d8a1873642b..2995a77f785d1becd88d7a9809489cb28983e320 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -923,7 +923,7 @@ thunar_window_init (ThunarWindow *window)
   g_free (last_location_bar);
 
   /* setup setting the location bar visibility on-demand */
-  g_signal_connect_swapped (G_OBJECT (window->preferences), "notify::last-location-bar", G_CALLBACK (thunar_window_update_location_bar_visible), window);
+  g_signal_connect_object (G_OBJECT (window->preferences), "notify::last-location-bar", G_CALLBACK (thunar_window_update_location_bar_visible), window, G_CONNECT_SWAPPED);
   thunar_window_update_location_bar_visible (window);
 
   /* determine the selected side pane (FIXME: Should probably be last-shortcuts-visible and last-tree-visible preferences) */