diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b88026..a13ddf2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Fixed an issue that caused a window to not become unmanaged when a space with a single window changed to float [#586](https://github.com/koekeishiya/yabai/issues/586)
 
 ## [3.2.1] - 2020-06-17
 ### Changed
diff --git a/src/view.c b/src/view.c
index 31dfae77..21228c5e 100644
--- a/src/view.c
+++ b/src/view.c
@@ -749,6 +749,7 @@ void view_clear(struct view *view)
     if (view->root) {
         if (view->root->left)  window_node_destroy(view->root->left);
         if (view->root->right) window_node_destroy(view->root->right);
+        if (view->root->window_id) window_manager_remove_managed_window(&g_window_manager, view->root->window_id);
         insert_feedback_destroy(view->root);
         memset(view->root, 0, sizeof(struct window_node));
         view_update(view);