diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index 9c732b6..cd07e81 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -808,8 +808,13 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){
             after = yon_char_replace(after,"=--","\\\"");
             postrotate = yon_char_append("postrotate,",after);
         }
+        if (!yon_char_is_empty(endwork)){
+            endwork = yon_char_replace(endwork,"\"","=--");
+            endwork = yon_char_replace(endwork,"=--","\\\"");
+            preremove = yon_char_append("preremove,",after);
+        }
         if (!yon_char_is_empty(firstaction)||!yon_char_is_empty(after_once)||!yon_char_is_empty(before)||!yon_char_is_empty(after)) 
-            endscript = yon_char_append("endscript ",endwork);
+            endscript = "endscript";
     }
 
     char *commandline = yon_char_unite(period,yon_add_space_if_exists(size),yon_add_space_if_exists(rotate_count),yon_add_space_if_exists(olddir),yon_add_space_if_exists(su),yon_add_space_if_exists(missingok),yon_add_space_if_exists(ifempty),yon_add_space_if_exists(notifempty),yon_add_space_if_exists(minage),yon_add_space_if_exists(maxage),yon_add_space_if_exists(minsize),yon_add_space_if_exists(maxsize),yon_add_space_if_exists(create),yon_add_space_if_exists(copytruncate),yon_add_space_if_exists(compress),yon_add_space_if_exists(delaycompress),yon_add_space_if_exists(extension),yon_add_space_if_exists(dateext),yon_add_space_if_exists(start),yon_add_space_if_exists(mail),yon_add_space_if_exists(mailfirst),yon_add_space_if_exists(sharedscripts),yon_add_space_if_exists(firstaction),yon_add_space_if_exists(lastaction),yon_add_space_if_exists(prerotate),yon_add_space_if_exists(postrotate),yon_add_space_if_exists(preremove),yon_add_space_if_exists(endscript),NULL);