diff --git a/data/gnome-online-accounts-gtk.desktop.in.in b/data/gnome-online-accounts-gtk.desktop.in.in
index 9be8407..69162e4 100644
--- a/data/gnome-online-accounts-gtk.desktop.in.in
+++ b/data/gnome-online-accounts-gtk.desktop.in.in
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Name=Gnome Online Accounts
 Type=Application
-Icon=applications-system-symbolic
+Icon=cs-online-accounts
 Exec=@bindir@/gnome-online-accounts-gtk
diff --git a/src/gnome-online-accounts-gtk.c b/src/gnome-online-accounts-gtk.c
index 4285669..a99d869 100644
--- a/src/gnome-online-accounts-gtk.c
+++ b/src/gnome-online-accounts-gtk.c
@@ -57,8 +57,6 @@ show_account_cb (GoaProvider  *provider,
         }
     }
 
-    gtk_list_box_select_row (GTK_LIST_BOX (window->accounts_listbox), NULL);
-
     g_error_free (error);
 }
 
@@ -271,30 +269,8 @@ on_account_changed (GoaClient *client,
                     GoaObject *object,
                     gpointer   user_data)
 {
-    OaWindow *window = OA_WINDOW (user_data);
-    GtkListBoxRow *selected_row;
-    GoaObject *selected_object;
-    int position;
-
-    // FIXME: Not sure if we even need to react to account-changed, goa updates its own
-    // dialog, and the appearance in the list box isn't going to change. I think it may
-    // be weird to popup an account without the user triggering it.
-
-    selected_row = gtk_list_box_get_selected_row (GTK_LIST_BOX (window->accounts_listbox));
-    if (selected_row != NULL)
-    {
-        return;
-    }
-
-    position = gtk_list_box_row_get_index (selected_row);
-    selected_object = g_list_model_get_item (window->accounts_model, position);
-
-    if (selected_object == object)
-    {
-        show_account (window, object);
-    }
-
-    g_object_unref (selected_object);
+    // TODO: anything needed?
+    g_debug ("Account changed");
 }
 
 static GtkWidget *
diff --git a/src/online-accounts.ui b/src/online-accounts.ui
index f2c39e0..1a9b51c 100644
--- a/src/online-accounts.ui
+++ b/src/online-accounts.ui
@@ -52,9 +52,9 @@
                         <property name="child">
                           <object class="GtkListBox" id="accounts_listbox">
                             <property name="focusable">1</property>
-                            <property name="selection_mode">single</property>
+                            <property name="selection_mode">none</property>
                             <property name="show-separators">1</property>
-                            <signal name="row-selected" handler="on_account_row_activated" object="OaWindow" swapped="no"/>
+                            <signal name="row-activated" handler="on_account_row_activated" object="OaWindow" swapped="no"/>
                           </object>
                         </property>
                       </object>