diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index 62a2373..a9ef47e 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -297,6 +297,14 @@ void yon_config_custom_save(){
 	template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_CUSTOM,config_get_command("system"),NULL);
 }
 
+void yon_gtk_windget_set_sensitive_from_entry_emptiness(GtkEntry *self, GtkWidget *target){
+    if (yon_char_is_empty(gtk_entry_get_text(self))){
+        gtk_widget_set_sensitive(target,0);
+    } else {
+        gtk_widget_set_sensitive(target,1);
+    }
+}
+
 void on_locale_toggle(GtkCellRendererToggle *self,GtkTreePath* path,GtkTreeViewColumn* column,locals_window *window){
     GtkTreeIter iter;
     GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(window->MainTree));
@@ -733,6 +741,8 @@ main_window *yon_main_window_complete(main_window *widgets){
 
     g_signal_connect(G_OBJECT(widgets->DomainButton),"clicked",G_CALLBACK(on_domain_opened),widgets);
     g_signal_connect(G_OBJECT(widgets->DomainEntry),"icon-press",G_CALLBACK(on_main_window_domain_status_clicked),widgets);
+    g_signal_connect(G_OBJECT(widgets->DomainEntry),"changed",G_CALLBACK(yon_gtk_windget_set_sensitive_from_entry_emptiness),widgets->DomainButton);
+
     g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets);
     
     gtk_widget_set_size_request(widgets->Window,800,-1);
diff --git a/ubl-settings-system.glade b/ubl-settings-system.glade
index 09f2dd0..2d6d2a2 100644
--- a/ubl-settings-system.glade
+++ b/ubl-settings-system.glade
@@ -159,6 +159,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkButton" id="DomainButton">
                         <property name="label" translatable="yes">Connect to domain</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="tooltip-text" translatable="yes">Domain connection</property>