diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index 8beee3c..1f6cd6d 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -552,7 +552,7 @@ gboolean on_main_window_domain_status_update(connection_window *window){
     return 1;
 }
 
-gboolean yon_update_thread(connection_window *window){
+gboolean yon_update_thread(GtkWidget *self, GdkEventFocus *event, connection_window *window){
     pthread_t thread_id;
     pthread_create(&thread_id, NULL, (void *)on_main_window_domain_status_update,window);
     return 1;
@@ -579,7 +579,10 @@ connection_window *yon_connection_window_new(){
     g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
     g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window);
     g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window);
-    window->timer_id = g_timeout_add(1000,(GSourceFunc)yon_update_thread,window);
+    g_signal_connect(G_OBJECT(window->FindEntry),"focus-out-event",G_CALLBACK(yon_update_thread),window);
+    if (!yon_char_is_empty((char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)))){
+        yon_update_thread(NULL,NULL,window);
+    }
 
     return window;
 }