diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index 37b9cd2..65a6c91 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -2477,6 +2477,11 @@ void on_log_add(GtkWidget *, main_window *widgets){
     on_log_path_append(NULL,window);
 }
 
+void on_log_edit_activate(GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets);
+void on_log_edit_activate(GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets){
+    on_log_edit(widgets->ServicesEditButton,widgets);
+}
+
 void on_log_edit(GtkWidget *,main_window *widgets){
     GtkTreeModel *model = GTK_TREE_MODEL(widgets->list);
     GtkTreeIter iter;
@@ -2639,6 +2644,12 @@ void on_log_remove(GtkWidget *, main_window *widgets){
 // Main window
 
 
+void on_service_edit_activate(GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets);
+void on_service_edit_activate(GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets){
+    on_service_edit(NULL,widgets);
+}
+
+
 void on_service_edit(GtkWidget *self,main_window *widgets){
     GtkTreeModel *model = GTK_TREE_MODEL(widgets->ServicesList);
     GtkTreeIter iter;
@@ -3081,8 +3092,10 @@ void yon_main_window_complete(template_main_window **window){
     g_signal_connect(G_OBJECT(widgets->InspectButton),"clicked",G_CALLBACK(on_inspector_open),widgets);
     g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_log_add),widgets);
     g_signal_connect(G_OBJECT(widgets->ConfigureButton),"clicked",G_CALLBACK(on_log_edit),widgets);
+    g_signal_connect(G_OBJECT(widgets->MainTree),"row-activated",G_CALLBACK(on_log_edit_activate),widgets);
     g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_log_remove),widgets);
     g_signal_connect(G_OBJECT(widgets->ServicesEditButton),"clicked",G_CALLBACK(on_service_edit),widgets);
+    g_signal_connect(G_OBJECT(widgets->ServicesTree),"row-activated",G_CALLBACK(on_service_edit_activate),widgets);
 
     g_signal_connect(G_OBJECT(widgets->SaveMenuItem),"activate",G_CALLBACK(on_save_global_local),NULL);
     g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem),"activate",G_CALLBACK(on_save_global),NULL);