diff --git a/lib/layout-machi/editor.lua b/lib/layout-machi/editor.lua
index f4c9178..8dc1fac 100644
--- a/lib/layout-machi/editor.lua
+++ b/lib/layout-machi/editor.lua
@@ -292,9 +292,10 @@ function module.create(data)
 
         local function cleanup()
             infobox.visible = false
-            if prev_layout ~= nil then
+            if prev_layout ~= nil and (not to_apply) then
                 awful.layout.set(prev_layout, tag)
             end
+            prev_layout = nil
         end
 
         local function draw_info(context, cr, width, height)