diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index f0238e24..217d3517 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -79,8 +79,9 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 	if (src_wp == dst_wp)
 		goto out;
 
-	if ((src_wp->flags & PANE_FLOATING) && (dst_wp->flags & PANE_FLOATING)) {
-		cmdq_error(item, "cannot swap two floating panes");
+	if ((src_wp->flags & PANE_FLOATING) &&
+	    (dst_wp->flags & PANE_FLOATING)) {
+		cmdq_error(item, "cannot swap floating panes");
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -103,6 +104,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 	dst_wp->layout_cell = src_lc;
 	dst_lc->wp = src_wp;
 	src_wp->layout_cell = dst_lc;
+	if ((src_wp->flags ^ dst_wp->flags) & PANE_FLOATING) {
+		src_wp->flags ^= PANE_FLOATING;
+		dst_wp->flags ^= PANE_FLOATING;
+	}
 
 	/* Swap PANE_FLOATING flag to keep each pane consistent with its new
 	 * layout cell (floating cells have parent == NULL). */