diff --git a/source/ubl-settings-system-domain.c b/source/ubl-settings-system-domain.c
index e986c01..399d614 100644
--- a/source/ubl-settings-system-domain.c
+++ b/source/ubl-settings-system-domain.c
@@ -138,9 +138,11 @@ void yon_domain_client_changed(GtkWidget*,connection_window *window){
     if (gtk_switch_get_active(GTK_SWITCH(window->AdditionalParametersDefaultSwitch))&&!yon_char_is_empty(id)&&strcmp(id,"none")){
         gtk_widget_set_sensitive(window->EditButton,1);
         gtk_widget_set_sensitive(window->AdditionalParametersEntry,1);
+        gtk_widget_set_sensitive(window->AdditionalParametersDefaultSwitch,1);
     } else {
         gtk_widget_set_sensitive(window->EditButton,0);
-        gtk_widget_set_sensitive(window->AdditionalParametersEntry,1);
+        gtk_widget_set_sensitive(window->AdditionalParametersEntry,0);
+        gtk_widget_set_sensitive(window->AdditionalParametersDefaultSwitch,0);
     }
 
 }
diff --git a/ubl-settings-system-domain-options.glade b/ubl-settings-system-domain-options.glade
index 0cb7021..b3d46f4 100644
--- a/ubl-settings-system-domain-options.glade
+++ b/ubl-settings-system-domain-options.glade
@@ -79,6 +79,11 @@
                         <property name="model">List</property>
                         <property name="headers-visible">False</property>
                         <property name="show-expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection">
+                            <property name="mode">none</property>
+                          </object>
+                        </child>
                         <child>
                           <object class="GtkTreeViewColumn">
                             <child>