Index: xfce4-timer-plugin-0.6.3/src/xfcetimer.c
===================================================================
--- xfce4-timer-plugin-0.6.3.orig/src/xfcetimer.c
+++ xfce4-timer-plugin-0.6.3/src/xfcetimer.c
@@ -125,7 +125,7 @@ static gboolean update_function (gpointe
   if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
     dialog = gtk_message_dialog_new     (NULL,
-                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
                                     GTK_MESSAGE_WARNING,
                                     GTK_BUTTONS_CLOSE,
                                     _("Beeep! :) \nTime is up!"));
@@ -684,6 +684,7 @@ static void add_edit_clicked (GtkButton
 
   plugin_data *pd = (plugin_data *)data;
 
+  GtkWindow *parent_window;
   GtkWindow *window;
   GtkLabel *label;
   GtkEntry *name,*command;
@@ -702,6 +703,9 @@ static void add_edit_clicked (GtkButton
   adata->pd=pd;
 
   gtk_window_set_modal(GTK_WINDOW(window),TRUE);
+  parent_window = gtk_widget_get_toplevel(buttonn);
+  if (gtk_widget_is_toplevel(parent_window))
+      gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent_window));
 
   vbox=gtk_vbox_new(FALSE, BORDER);
   gtk_container_add(GTK_CONTAINER(window),vbox);