diff --git a/src/clfswm-circulate-mode.lisp b/src/clfswm-circulate-mode.lisp
index 7c52dda556dab7ac0f62252f9c649c280eb8a4b3..720d456c5d40978716be355bfcf844ea73c8b011 100644
--- a/src/clfswm-circulate-mode.lisp
+++ b/src/clfswm-circulate-mode.lisp
@@ -266,12 +266,11 @@
 
 
 (defmacro with-move-current-focused-window (() &body body)
-  (let ((window (gensym)))
-    `(with-focus-window (,window)
-       ,@body
-       (move-child-to ,window (if (frame-p (current-child))
-                                  (current-child)
-                                  (find-parent-frame (current-child) (find-current-root)))))))
+  `(with-current-window
+     ,@body
+     (move-child-to window (if (frame-p (current-child))
+                               (current-child)
+                               (find-parent-frame (current-child) (find-current-root))))))
 
 
 
diff --git a/src/clfswm-second-mode.lisp b/src/clfswm-second-mode.lisp
index 50029f2c2499429c4ecfbf0ada04aecd1a8bcda2..b8d4ac4edfb5f3364d0bb7cc054ebbfa9812a79f 100644
--- a/src/clfswm-second-mode.lisp
+++ b/src/clfswm-second-mode.lisp
@@ -42,7 +42,8 @@
 		      (truncate (/ (- *sm-width* (* (xlib:max-char-width *sm-font*) len)) 2))
 		      (truncate (/ (+ *sm-height* (- (xlib:font-ascent *sm-font*) (xlib:font-descent *sm-font*))) 2))
 		      text))
-  (copy-pixmap-buffer *sm-window* *sm-gc*))
+  (copy-pixmap-buffer *sm-window* *sm-gc*)
+  (no-focus))