diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 24ed0b9d..48785c92 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -79,7 +79,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 	if (src_wp == dst_wp)
 		goto out;
 
-	if (window_pane_is_floating(src_wp) &&
+	if (window_pane_is_floating(src_wp) ||
 	    window_pane_is_floating(dst_wp)) {
 		cmdq_error(item, "cannot swap floating panes");
 		return (CMD_RETURN_ERROR);