diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cbe37d..c89d83e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Support for raw icons
 - `hide_duplicate_count` option to hide the number of duplicate notifications
 - Support for per-urgency frame colours
-- `markup` setting for more fine-gained control over how markup is handled
+- `markup` setting for more fine-grained control over how markup is handled
 - `history_ignore` rule action to exclude a notification from being added to the history
 
 ###Changed
@@ -26,6 +26,7 @@
 - Icon alignment with dynamic width
 - Loading each line of the configuration file no longer relies on a static size buffer
 - `ignore_newline` now works regardless of the markup setting
+- dmenu process being left as a zombie if no option was selected
 
 ##1.1.0 - 2014-07-29
 - fix nasty memory leak
diff --git a/src/menu.c b/src/menu.c
index 4681f36..035d9e0 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -201,7 +201,7 @@ void context_menu(void)
              iter = iter->next) {
                 notification *n = iter->data;
 
-                if(n->urls)
+                if (n->urls)
                         dmenu_input = string_append(dmenu_input, n->urls, "\n");
 
                 if (n->actions)
@@ -252,13 +252,13 @@ void context_menu(void)
                 close(child_io[1]);
 
                 size_t len = read(parent_io[0], buf, 1023);
+
+                waitpid(pid, NULL, 0);
+
                 if (len == 0) {
                         g_free(dmenu_input);
                         return;
                 }
-
-                int status;
-                waitpid(pid, &status, 0);
         }
 
         close(parent_io[0]);