diff --git a/ChangeLog b/ChangeLog
index 8e60b5b8616f19e9e7aa7d1b65c8984c5c96a975..b696be5e86b24fa91cc6aa36606d656783907be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-03	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-window.c(thunar_window_set_current_directory): Place
+	  focus on the main view after changing the currently displayed
+	  folder. Bug #2367.
+
 2006-11-03	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-icon-renderer.c(thunar_icon_renderer_render): Make sure
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index ee8e426673cff53d4e6a231367acde37011bb556..48a86928087cd2c4652925c182a59d35d3417467 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -2302,6 +2302,10 @@ thunar_window_set_current_directory (ThunarWindow *window,
     
       /* update window icon and title */
       thunar_window_current_directory_changed (current_directory, window);
+
+      /* grab the focus to the main view */
+      if (G_LIKELY (window->view != NULL))
+        gtk_widget_grab_focus (window->view);
     }
 
   /* enable the 'Open new window' action if we have a valid directory */