diff --git a/features/layout/unmanage.feature b/features/layout/unmanage.feature
index 313853c..dcb950e 100644
--- a/features/layout/unmanage.feature
+++ b/features/layout/unmanage.feature
@@ -6,5 +6,5 @@ Feature: layout client unmanagement
     And a second window is mapped
 
   Scenario: maps another window
-    When the second window requests to be unmapped
+    When the second window is unmapped
     Then the first window must be mapped
diff --git a/features/steps/x_steps.rb b/features/steps/x_steps.rb
index 079873f..1f8e51a 100644
--- a/features/steps/x_steps.rb
+++ b/features/steps/x_steps.rb
@@ -19,8 +19,9 @@ When /^the window requests to be unmapped$/ do
   x_window_unmap
 end
 
-When /^the (\w+) window requests to be unmapped$/ do |ident|
+When /^the (\w+) window is unmapped$/ do |ident|
   x_window_unmap ident: ident
+  uhwm_wait_output /unmanag.+#{x_client(ident: ident).name}/i
 end
 
 When /^a window requests to be mapped (\d+) times$/ do |times|