diff --git a/swayipc/dispatcher.scm b/swayipc/dispatcher.scm
index 7520c36..757ee3d 100644
--- a/swayipc/dispatcher.scm
+++ b/swayipc/dispatcher.scm
@@ -1616,19 +1616,19 @@ windows and then jump to them at a later time.
    (string-join
     (filter (lambda (x) (and x (> (string-length x) 0)))
             (list
-             (if class (string-append "class=" class) "")
-             (if con-id (string-append "con_id=" (number->string con-id)) "")
-             (if con-mark (string-append "con_mark=" con-mark) "")
-             (if floating (string-append "floating=" floating) "")
-             (if id (string-append "id=" (number->string id)) "")
-             (if instance (string-append "instance=" instance) "")
-             (if pid (string-append "pid=" (number->string pid)) "")
-             (if shell (string-append "shell=" shell) "")
-             (if tiling (string-append "tiling=" tiling) "")
-             (if title (string-append "title=" title) "")
-             (if urgent (string-append "urgent=" urgent) "")
-             (if window-role (string-append "window_role=" window-role) "")
-             (if window-type (string-append "window_type=" window-type) "")
-             (if workspace (string-append "workspace=" workspace) "")))
+             (if class (format #f "class=\"~a\"" class) "")
+             (if con-id (format #f "con_id=~a" con-id) "")
+             (if con-mark (format #f "con_mark=\"~a\"" con-mark) "")
+             (if floating (format #f "floating=\"~a\"" floating) "")
+             (if id (format #f "id=~a" id) "")
+             (if instance (format #f "instance=\"~a\"" instance) "")
+             (if pid (format #f "pid=~a" pid) "")
+             (if shell (format #f "shell=\"~a\"" shell) "")
+             (if tiling (format #f "tiling=\"~a\"" tiling) "")
+             (if title (format #f "title=\"~a\"" title) "")
+             (if urgent (format #f "urgent=\"~a\"" urgent) "")
+             (if window-role (format #f "window_role=\"~a\"" window-role) "")
+             (if window-type (format #f "window_type=\"~a\"" window-type) "")
+             (if workspace (format #f "workspace=\"~a\"" workspace) "")))
     " ")
    "]"))