diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 51e67ae65..1b6366325 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-28  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-da-capplet.c: (web_combo_changed_cb): update the entry with
+	the correct command for the selected option instead of always using
+	the default
+
 2009-01-20  Bastien Nocera  <hadess@hadess.net>
 
 	* gnome-da-capplet.c (web_radiobutton_toggled_cb),
diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c
index 41fd8bf3e..cbe9d24a2 100644
--- a/capplets/default-applications/gnome-da-capplet.c
+++ b/capplets/default-applications/gnome-da-capplet.c
@@ -105,6 +105,7 @@ web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
     gboolean is_custom_active;
     gboolean has_net_remote;
     GnomeDAWebItem *item;
+    GtkWidget *active = NULL;
 
     current_index = gtk_combo_box_get_active (combo);
 
@@ -127,7 +128,17 @@ web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
     gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
     gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
 
-    web_radiobutton_toggled_cb (NULL, capplet);
+    if (has_net_remote) {
+
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)))
+            active = capplet->new_win_radiobutton;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)))
+            active = capplet->new_tab_radiobutton;
+        else
+            active = capplet->default_radiobutton;
+    }
+
+    web_radiobutton_toggled_cb (active, capplet);
 }
 
 /* FIXME: Refactor these two functions below into one... */