diff --git a/libublsettingsui-gtk3-config-window.glade b/libublsettingsui-gtk3-config-window.glade
index 14a981b..7c1f9dd 100644
--- a/libublsettingsui-gtk3-config-window.glade
+++ b/libublsettingsui-gtk3-config-window.glade
@@ -7,6 +7,7 @@
     <property name="width-request">450</property>
     <property name="height-request">176</property>
     <property name="can-focus">False</property>
+    <property name="modal">True</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3</property>
     <property name="type-hint">dialog</property>
     <child>
diff --git a/source/libublsettingsui-gtk3-config-window.c b/source/libublsettingsui-gtk3-config-window.c
index 4654c05..f6aeb4a 100644
--- a/source/libublsettingsui-gtk3-config-window.c
+++ b/source/libublsettingsui-gtk3-config-window.c
@@ -140,8 +140,6 @@ ubl_settings_window *yon_ubl_settings_window_new(){
     window->WorkZoneBox = yon_gtk_builder_get_widget(builder,"WorkZoneBox");
     // window->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton");
     // window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
-    char *icon_name = yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL);
-    yon_gtk_window_setup(GTK_WINDOW(window->window),NULL,SETTINGS_TITLE_LABEL,icon_name,"SETTINGS_WINDOW");
     g_signal_connect(G_OBJECT(window->window),"delete-event",G_CALLBACK(yon_on_settings_window_accept),window);
     return window;
 }
@@ -154,9 +152,11 @@ struct yon_configuration_custom_parameter {
 
 dictionary *__yon_configuration_custom_parameters = NULL;
 
-void __yon_on_ubl_settings_window_open(){
+void __yon_on_ubl_settings_window_open(GtkWidget *self){
     if (!__yon_configuration_custom_parameters) return;
     ubl_settings_window *window = yon_ubl_settings_window_new();
+    char *icon_name = yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL);
+    yon_gtk_window_setup(GTK_WINDOW(window->window),GTK_WINDOW(gtk_widget_get_toplevel(self)),SETTINGS_TITLE_LABEL,icon_name,"SETTINGS_WINDOW");
     dictionary *current = NULL;
     for_dictionaries(current,__yon_configuration_custom_parameters){
         struct yon_configuration_custom_parameter *parameter = ((struct yon_configuration_custom_parameter*)current->data);