diff --git a/src/modules/ext/workspace_manager.cpp b/src/modules/ext/workspace_manager.cpp
index b4471c14b1..cfb4d88983 100644
--- a/src/modules/ext/workspace_manager.cpp
+++ b/src/modules/ext/workspace_manager.cpp
@@ -301,6 +301,7 @@ void WorkspaceGroup::handle_output_leave(wl_output* output) {
 
 void WorkspaceGroup::handle_workspace_enter(ext_workspace_handle_v1* handle) {
   workspaces_.push_back(handle);
+  workspaces_manager_.set_needs_sorting();
 }
 
 void WorkspaceGroup::handle_workspace_leave(ext_workspace_handle_v1* handle) {
@@ -308,6 +309,7 @@ void WorkspaceGroup::handle_workspace_leave(ext_workspace_handle_v1* handle) {
   if (it != workspaces_.end()) {
     workspaces_.erase(it);
   }
+  workspaces_manager_.set_needs_sorting();
 }
 
 void WorkspaceGroup::handle_removed() {