diff --git a/plugins/filebrowser/gedit-file-browser-view.c b/plugins/filebrowser/gedit-file-browser-view.c
index 96b517fdc5..8060561ce3 100644
--- a/plugins/filebrowser/gedit-file-browser-view.c
+++ b/plugins/filebrowser/gedit-file-browser-view.c
@@ -409,6 +409,20 @@ activate_selected_items (GeditFileBrowserView *view)
 		activate_selected_bookmark (view);
 }
 
+static void
+row_activated (GtkTreeView       *tree_view,
+               GtkTreePath       *path,
+               GtkTreeViewColumn *column)
+{
+	GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
+
+	/* Make sure the activated row is the only one selected */
+	gtk_tree_selection_unselect_all (selection);
+	gtk_tree_selection_select_path (selection, path);
+
+	activate_selected_items (GEDIT_FILE_BROWSER_VIEW (tree_view));
+}
+
 static void
 toggle_hidden_filter (GeditFileBrowserView *view)
 {
@@ -899,6 +913,7 @@ gedit_file_browser_view_class_init (GeditFileBrowserViewClass *klass)
 	widget_class->key_press_event = key_press_event;
 
 	/* Tree view handlers */
+	tree_view_class->row_activated = row_activated;
 	tree_view_class->row_expanded = row_expanded;
 	tree_view_class->row_collapsed = row_collapsed;