diff --git a/src/layout.sh b/src/layout.sh
index b160f4c..3cf4ae3 100755
--- a/src/layout.sh
+++ b/src/layout.sh
@@ -18,15 +18,24 @@ kill_layout() {
   kill $old_pid 2> /dev/null || true;
 }
 
+# Kill old process
+kill_process() {
+  local old_pid=$1;
+  kill $old_pid 2> /dev/null || true;
+}
+
 remove_listener() {
   desktop=$1;
   [[ -z "$desktop" ]] && desktop=$(get_focused_desktop);
 
-  kill_layout "$desktop";
+  local old_pid="$(get_desktop_options "$desktop" | valueof pid)";
 
   # Reset process id and layout
   set_desktop_option $desktop 'layout' "";
   set_desktop_option $desktop 'pid'    "";
+  set_desktop_option $desktop 'did'    "";
+
+  kill_layout $old_pid;
 }
 
 get_layout_file() {
@@ -141,13 +150,21 @@ start_listener() {
   __recalculate_layout() { run_layout $layout $args 2> /dev/null || true; }
 
   # Then listen to node changes and recalculate as required
-  bspc subscribe node_{add,remove,transfer,flag,state} desktop_focus | while read line; do
+  bspc subscribe node_{add,remove,transfer,flag,state} desktop_focus desktop_remove | while read line; do
     event=$(echo "$line" | awk '{print $1}');
     arg_index=$([[ "$event" == "node_transfer" ]] && echo "6" || echo "3");
     desktop_id=$(echo "$line" | awk "{print \$$arg_index}");
     desktop_name=$(get_desktop_name_from_id "$desktop_id");
 
-    if [[ "$desktop_name" = "$selected_desktop" ]]; then
+    if [[ "$event" == "desktop_remove" ]]; then
+      selected_desktop_id=$(get_desktop_options "$selected_desktop" | valueof did);
+      if [[ "$desktop_id" == "$selected_desktop_id" ]]; then
+        remove_listener "$selected_desktop";
+        exit 0;
+      fi
+    fi
+
+    if [[ "$desktop_name" == "$selected_desktop" ]]; then
       __initialize_layout;
 
       if [[ "$event" == "node_transfer" ]]; then
@@ -165,11 +182,14 @@ start_listener() {
   disown;
 
   # Kill old layout
-  kill_layout $selected_desktop;
+  local old_pid="$(get_desktop_options "$selected_desktop" | valueof pid)";
+  kill_layout $old_pid;
 
+  desktop_id=$(get_desktop_id "$selected_desktop");
   # Set current layout
   set_desktop_option $selected_desktop 'layout' "$layout";
   set_desktop_option $selected_desktop 'pid'    "$LAYOUT_PID";
+  set_desktop_option $selected_desktop 'did'    "$desktop_id";
 
   # Recalculate styles as soon as they are set if it is on the selected desktop
   if [[ "$(get_focused_desktop)" == "$selected_desktop" ]]; then
diff --git a/src/utils/desktop.sh b/src/utils/desktop.sh
index 78bc3d0..5ad1d61 100644
--- a/src/utils/desktop.sh
+++ b/src/utils/desktop.sh
@@ -3,4 +3,4 @@ names="--names"
 [[ $USE_NAMES -eq 0 ]] && names="";
 get_focused_desktop() { bspc query -D -d 'focused' $names; }
 get_desktop_name_from_id() { bspc query -D -d "$1" $names; }
-
+get_desktop_id() { bspc query -D -d "$1"; }