diff --git a/options-table.c b/options-table.c
index 25f8c7c7..3bff66b5 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1237,28 +1237,6 @@ const struct options_table_entry options_table[] = {
 	  .text = "Character used to fill unused parts of window."
 	},
 
-	{ .name = "floating-pane-border-style",
-	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "default",
-	  .flags = OPTIONS_TABLE_IS_STYLE,
-	  .separator = ",",
-	  .text = "Default border style for floating panes. "
-		  "Overrides pane-border-style for floating panes unless "
-		  "a per-pane style is set."
-	},
-
-	{ .name = "floating-pane-style",
-	  .type = OPTIONS_TABLE_STRING,
-	  .scope = OPTIONS_TABLE_WINDOW,
-	  .default_str = "default",
-	  .flags = OPTIONS_TABLE_IS_STYLE,
-	  .separator = ",",
-	  .text = "Default content style for floating panes. "
-		  "Overrides window-style for floating panes unless "
-		  "a per-pane style is set."
-	},
-
 	{ .name = "main-pane-height",
 	  .type = OPTIONS_TABLE_STRING,
 	  .scope = OPTIONS_TABLE_WINDOW,
diff --git a/screen-redraw.c b/screen-redraw.c
index 3862e066..4fd79387 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -604,8 +604,6 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp,
 	else
 		border_option = "pane-border-style";
 	style_apply(&gc, w->options, border_option, ft);
-	if (wp->flags & PANE_FLOATING)
-		style_add(&gc, w->options, "floating-pane-border-style", ft);
 	if (options_get_only(wp->options, border_option) != NULL)
 		style_add(&gc, wp->options, border_option, ft);
 	fmt = options_get_string(wp->options, "pane-border-format");
diff --git a/tty.c b/tty.c
index 7f39dbb8..c3712a85 100644
--- a/tty.c
+++ b/tty.c
@@ -3080,10 +3080,6 @@ tty_default_colours(struct grid_cell *gc, struct window_pane *wp)
 		/* Window-level baseline. */
 		tty_window_default_style(&wp->cached_active_gc, wp);
 		style_add(&wp->cached_active_gc, wo, "window-active-style", ft);
-		/* Floating pane window default overrides window baseline. */
-		if (wp->flags & PANE_FLOATING)
-			style_add(&wp->cached_active_gc, wo,
-			    "floating-pane-style", ft);
 		/* Per-pane override (set via new-pane -s or select-pane -P). */
 		if (options_get_only(wp->options, "window-active-style") != NULL)
 			style_add(&wp->cached_active_gc, wp->options,
@@ -3092,9 +3088,6 @@ tty_default_colours(struct grid_cell *gc, struct window_pane *wp)
 		/* Window-level baseline. */
 		tty_window_default_style(&wp->cached_gc, wp);
 		style_add(&wp->cached_gc, wo, "window-style", ft);
-		/* Floating pane window default overrides window baseline. */
-		if (wp->flags & PANE_FLOATING)
-			style_add(&wp->cached_gc, wo, "floating-pane-style", ft);
 		/* Per-pane override (set via new-pane -s or select-pane -P). */
 		if (options_get_only(wp->options, "window-style") != NULL)
 			style_add(&wp->cached_gc, wp->options,