diff --git a/webui-desktop b/webui-desktop
index 1acdd09f6..6cfc63060 100755
--- a/webui-desktop
+++ b/webui-desktop
@@ -104,6 +104,12 @@ exec > >(systemd-cat -t anaconda) 2>&1
 # Cleanup function
 cleanup() {
     set +e
+    if [[ "$WEBUI_REMOTE" == "1" ]]
+    then
+        echo "Warning: BROWSER died unexpectedly. Not doing further cleanup as we might be connecting remotely."
+        wait $WS_PID
+    fi
+
     kill $WS_PID
     wait $WS_PID
     kill $B_PID