diff --git a/ChangeLog b/ChangeLog
index 0d5ac6c02a9d82dc106d5e41924fa40a071cc3ee..b2865425491e100e72d34d99688d0fcd0919da8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-13	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-path-entry.c(thunar_path_entry_init): Always sort
+	  folders before files here, and always include hidden files in the
+	  entry completion.
+
 2006-03-13	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-standard-view.c(thunar_standard_view_drag_motion): Add
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 9348848704862ab67b3b4f6dc3a4296d4789270b..79437d2d09be5c79a65634123c72b8549d86c027 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -38,7 +38,6 @@
 #include <thunar/thunar-icon-renderer.h>
 #include <thunar/thunar-list-model.h>
 #include <thunar/thunar-path-entry.h>
-#include <thunar/thunar-preferences.h>
 
 
 
@@ -275,7 +274,6 @@ static void
 thunar_path_entry_init (ThunarPathEntry *path_entry)
 {
   GtkEntryCompletion *completion;
-  ThunarPreferences  *preferences;
   GtkCellRenderer    *renderer;
   ThunarListModel    *store;
 
@@ -301,12 +299,10 @@ thunar_path_entry_init (ThunarPathEntry *path_entry)
 
   /* allocate a new list mode for the completion */
   store = thunar_list_model_new ();
-  preferences = thunar_preferences_get ();
-  exo_binding_new (G_OBJECT (preferences), "last-show-hidden", G_OBJECT (store), "show-hidden");
-  exo_binding_new (G_OBJECT (preferences), "misc-folders-first", G_OBJECT (store), "folders-first");
+  thunar_list_model_set_show_hidden (store, TRUE);
+  thunar_list_model_set_folders_first (store, TRUE);
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), THUNAR_COLUMN_FILE_NAME, GTK_SORT_ASCENDING);
   gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (store));
-  g_object_unref (G_OBJECT (preferences));
   g_object_unref (G_OBJECT (store));
 
   /* setup the new completion */