diff --git a/user.lisp b/user.lisp
index 2c334d9..b7762ca 100644
--- a/user.lisp
+++ b/user.lisp
@@ -278,9 +278,10 @@ instance. @var{all-groups} overrides this default. Similarily for
       ;; does not select the screen.
       ((goto-win (win)
          (let* ((group (window-group win))
-                (frame (window-frame win))
-                (old-frame (tile-group-current-frame group)))
-           (frame-raise-window group frame win)
+                (frame (unless (typep win 'float-window) (window-frame win)))
+                (old-frame (when frame (tile-group-current-frame group))))
+           (when frame
+             (frame-raise-window group frame win))
            (focus-all win)
            (unless (eq frame old-frame)
              (show-frame-indicator group)))))