diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js b/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js
index 4af3af979..95e3d0d40 100755
--- a/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js
+++ b/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js
@@ -107,6 +107,9 @@ MyDesklet.prototype = {
 				);
 				GLib.close(std_in);
 				GLib.close(std_err);
+				GLib.child_watch_add(GLib.PRIORITY_DEFAULT, child_pid, function(pid, wait_status, user_data) {
+					GLib.spawn_close_pid(child_pid);
+				});
 				if(!success) {
 					throw new Error(_('Error executing ping command!'));
 				}
@@ -144,7 +147,6 @@ MyDesklet.prototype = {
 						}
 						GLib.source_remove(tagWatchStdOut);
 						channel.shutdown(true);
-						GLib.spawn_close_pid(child_pid);
 					}
 				);
 				//this.ioChannelStdErr = GLib.IOChannel.unix_new(this.std_err);
diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json b/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json
index b84261b5d..aae617d97 100644
--- a/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json
+++ b/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json
@@ -2,6 +2,6 @@
     "max-instances": "10",
     "description": "Checks a host via ping or HTTP(S) and displays if it is available.",
     "name": "Host Check",
-    "version": "1.5",
+    "version": "1.5.1",
     "uuid": "hostcheck@schorschii"
 }