diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dac4dc7..344fa8ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 - Blacklist loginwindow and ScreenSaverEngine processes [#537](https://github.com/koekeishiya/yabai/issues/537)
 - Resolve some issues with the lifetime of NSRunningApplication [#543](https://github.com/koekeishiya/yabai/issues/543)
+- Properly clear insert feedback settings if active on the root node when it is closed [#546](https://github.com/koekeishiya/yabai/issues/546)
 
 ## [3.0.2] - 2020-05-22
 ### Changed
diff --git a/src/view.c b/src/view.c
index 399c7948..19912f40 100644
--- a/src/view.c
+++ b/src/view.c
@@ -439,8 +439,12 @@ void view_remove_window_node(struct view *view, struct window *window)
     if (!node) return;
 
     if (node == view->root) {
-        view->root->window_id = 0;
-        insert_feedback_destroy(view->root);
+        node->window_id = 0;
+        insert_feedback_destroy(node);
+        node->split = SPLIT_NONE;
+        node->child = CHILD_NONE;
+        node->insert_dir = 0;
+        view->insertion_point = 0;
         return;
     }