diff --git a/src/gtk/fm-app-chooser-dlg.c b/src/gtk/fm-app-chooser-dlg.c
index e1bb185d..017875c1 100644
--- a/src/gtk/fm-app-chooser-dlg.c
+++ b/src/gtk/fm-app-chooser-dlg.c
@@ -338,7 +338,7 @@ GtkDialog *fm_app_chooser_dlg_new(FmMimeType* mime_type, gboolean can_set_defaul
         gtk_widget_hide(GTK_WIDGET(data->set_default));
     }
 
-    data->apps_view = fm_app_menu_view_new();
+    data->apps_view = fm_app_menu_view_new(data->dlg);
     gtk_tree_view_set_headers_visible(data->apps_view, FALSE);
     gtk_widget_show(GTK_WIDGET(data->apps_view));
     gtk_container_add(scroll, GTK_WIDGET(data->apps_view));
diff --git a/src/gtk/fm-app-menu-view.c b/src/gtk/fm-app-menu-view.c
index f0ba4358..a4a53917 100644
--- a/src/gtk/fm-app-menu-view.c
+++ b/src/gtk/fm-app-menu-view.c
@@ -142,6 +142,29 @@ static void on_menu_cache_reload(gpointer mc, gpointer user_data)
     }
 }
 
+static void on_row_activated (GtkTreeView* treeview, GtkTreePath* path, GtkTreeViewColumn* col, gpointer userdata)
+{
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    GtkDialog* dialog = GTK_DIALOG(userdata);
+
+    model = gtk_tree_view_get_model(treeview);
+
+    if (gtk_tree_model_get_iter(model, &iter, path))
+    {
+        if (fm_app_menu_view_is_item_app(treeview, &iter)) {
+            gtk_dialog_response(dialog, GTK_RESPONSE_OK);
+            return;
+        }
+
+        if (gtk_tree_view_row_expanded(treeview, path)) {
+            gtk_tree_view_collapse_row(treeview, path);
+        } else {
+            gtk_tree_view_expand_row(treeview, path, FALSE);
+        }
+    }
+}
+
 /**
  * fm_app_menu_view_new
  *
@@ -151,7 +174,7 @@ static void on_menu_cache_reload(gpointer mc, gpointer user_data)
  *
  * Since: 0.1.0
  */
-GtkTreeView *fm_app_menu_view_new(void)
+GtkTreeView *fm_app_menu_view_new(GtkDialog* dlg)
 {
     GtkTreeView* view;
     GtkTreeViewColumn* col;
@@ -202,6 +225,8 @@ GtkTreeView *fm_app_menu_view_new(void)
 
     view = (GtkTreeView*)gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 
+    g_signal_connect(view, "row-activated", G_CALLBACK(on_row_activated), dlg);
+
     render = gtk_cell_renderer_pixbuf_new();
     col = gtk_tree_view_column_new();
     gtk_tree_view_column_set_title(col, _("Installed Applications"));
diff --git a/src/gtk/fm-app-menu-view.h b/src/gtk/fm-app-menu-view.h
index b60afa59..4cd3d242 100644
--- a/src/gtk/fm-app-menu-view.h
+++ b/src/gtk/fm-app-menu-view.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-GtkTreeView* fm_app_menu_view_new(void);
+GtkTreeView* fm_app_menu_view_new(GtkDialog* dlg);
 
 GAppInfo* fm_app_menu_view_dup_selected_app(GtkTreeView* view);